You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2019/10/13 12:03:23 UTC
svn commit: r1868400 - in /pdfbox/trunk: ./
fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java
fontbox/src/test/resources/cmap/CMapMalformedbfrange2
Author: lehmi
Date: Sun Oct 13 12:03:22 2019
New Revision: 1868400
URL: http://svn.apache.org/viewvc?rev=1868400&view=rev
Log:
PDFBOX-4661: avoid overflow of the last byte following the spec, as proposed by Michael Klink
Modified:
pdfbox/trunk/ (props changed)
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java
pdfbox/trunk/fontbox/src/test/resources/cmap/CMapMalformedbfrange2
Propchange: pdfbox/trunk/
------------------------------------------------------------------------------
Merged /pdfbox/branches/2.0:r1868399
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java?rev=1868400&r1=1868399&r2=1868400&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java Sun Oct 13 12:03:22 2019
@@ -377,18 +377,14 @@ public class CMapParser
// PDFBOX-3807: ignore null
else if (nextToken instanceof byte[])
{
- // the range can not represent more that 255 values
- // PDFBOX-4661: be more lenient and support 256 values as well
- if ((end - start) > 256)
- {
- // PDFBOX-4550: likely corrupt stream
- break;
- }
byte[] tokenBytes = (byte[]) nextToken;
// PDFBOX-3450: ignore <>
if (tokenBytes.length > 0)
{
- addMappingFrombfrange(result, startCode, end - start + 1, tokenBytes);
+ // PDFBOX-4661: avoid overflow of the last byte, all following values are undefined
+ int values = Math.min(end - start + 1,
+ 255 - (tokenBytes[tokenBytes.length - 1] & 0xFF));
+ addMappingFrombfrange(result, startCode, values, tokenBytes);
}
}
}
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java?rev=1868400&r1=1868399&r2=1868400&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java Sun Oct 13 12:03:22 2019
@@ -146,12 +146,13 @@ public class TestCMapParser extends Test
assertNotNull("Failed to parse malformed CMap file", cMap);
- byte[] bytes1 = { 0, 1 };
- assertEquals("bytes 00 01 from bfrange <0001> <0009> <0041>", "A",
- cMap.toUnicode(toInt(bytes1, bytes1.length)));
+ assertEquals("bytes 00 01 from bfrange <0001> <0009> <0030>", "0", cMap.toUnicode(0x001));
- byte[] bytes2 = { 2, 00 };
- assertNull(cMap.toUnicode(toInt(bytes2, bytes2.length)));
+ assertEquals("bytes 02 32 from bfrange <0232> <0432> <0041>", "A", cMap.toUnicode(0x232));
+
+ // check border values
+ assertNotNull(cMap.toUnicode(0x2EF));
+ assertNull(cMap.toUnicode(0x2F0));
}
Modified: pdfbox/trunk/fontbox/src/test/resources/cmap/CMapMalformedbfrange2
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/resources/cmap/CMapMalformedbfrange2?rev=1868400&r1=1868399&r2=1868400&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/resources/cmap/CMapMalformedbfrange2 (original)
+++ pdfbox/trunk/fontbox/src/test/resources/cmap/CMapMalformedbfrange2 Sun Oct 13 12:03:22 2019
@@ -18,12 +18,12 @@
%%
%%EndComments
-1 begincodespacerange<0000> <02FF>
+1 begincodespacerange<0000> <04FF>
endcodespacerange
2 beginbfrange
-<0001> <0009> <0041>
-<0200> <0400> <0030>
+<0001> <0009> <0030>
+<0232> <0432> <0041>
endbfrange
endcmap