ASF Bugzilla – Attachment 14954 Details for
Bug 34787
[PATCH] stop ddf.EscherClientAnchorRecord breaking on short records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for short records
EscherClientAnchorRecord.diff (text/plain), 1.71 KB, created by
Nick Burch
on 2005-05-06 18:09:28 UTC
(
hide
)
Description:
patch for short records
Filename:
MIME Type:
Creator:
Nick Burch
Created:
2005-05-06 18:09:28 UTC
Size:
1.71 KB
patch
obsolete
>--- EscherClientAnchorRecord.java.sav 2005-05-06 12:24:25.000000000 +0100 >+++ EscherClientAnchorRecord.java 2005-05-06 17:03:56.000000000 +0100 >@@ -61,15 +61,19 @@ > int bytesRemaining = readHeader( data, offset ); > int pos = offset + 8; > int size = 0; >+ >+ // Always find 4 two byte entries. Sometimes find 9 > field_1_flag = LittleEndian.getShort( data, pos + size ); size += 2; > field_2_col1 = LittleEndian.getShort( data, pos + size ); size += 2; > field_3_dx1 = LittleEndian.getShort( data, pos + size ); size += 2; > field_4_row1 = LittleEndian.getShort( data, pos + size ); size += 2; >- field_5_dy1 = LittleEndian.getShort( data, pos + size ); size += 2; >- field_6_col2 = LittleEndian.getShort( data, pos + size ); size += 2; >- field_7_dx2 = LittleEndian.getShort( data, pos + size ); size += 2; >- field_8_row2 = LittleEndian.getShort( data, pos + size ); size += 2; >- field_9_dy2 = LittleEndian.getShort( data, pos + size ); size += 2; >+ if(bytesRemaining >= 18) { >+ field_5_dy1 = LittleEndian.getShort( data, pos + size ); size += 2; >+ field_6_col2 = LittleEndian.getShort( data, pos + size ); size += 2; >+ field_7_dx2 = LittleEndian.getShort( data, pos + size ); size += 2; >+ field_8_row2 = LittleEndian.getShort( data, pos + size ); size += 2; >+ field_9_dy2 = LittleEndian.getShort( data, pos + size ); size += 2; >+ } > bytesRemaining -= size; > remainingData = new byte[bytesRemaining]; > System.arraycopy( data, pos + size, remainingData, 0, bytesRemaining );
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 34787
:
14954
|
14955
|
15172