Fix bug with IndexOutOfBounds exception in type3 font

Eugene Bochilo · iText-CI · commit 02e0c8aa27b7 · 2021-11-26T10:21:50.000Z
DEVSIX-6103

Autoported commit.
Original commit hash: [c09528c66]
diff --git a/itext.tests/itext.kernel.tests/itext/kernel/pdf/canvas/parser/TextExtractIllegalDifferencesTest.cs b/itext.tests/itext.kernel.tests/itext/kernel/pdf/canvas/parser/TextExtractIllegalDifferencesTest.cs
@@ -51,10 +51,19 @@ public class TextExtractIllegalDifferencesTest : ExtendedITextTest {
             .CurrentContext.TestDirectory) + "/resources/itext/kernel/parser/TextExtractIllegalDifferencesTest/";
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.IO.Logs.IoLogMessageConstant.DOCFONT_HAS_ILLEGAL_DIFFERENCES, Count = 1)]
+        [LogMessage(iText.IO.Logs.IoLogMessageConstant.DOCFONT_HAS_ILLEGAL_DIFFERENCES)]
         public virtual void IllegalDifference() {
-            PdfDocument pdf = new PdfDocument(new PdfReader(sourceFolder + "illegalDifference.pdf"));
-            PdfTextExtractor.GetTextFromPage(pdf.GetFirstPage());
+            using (PdfDocument pdf = new PdfDocument(new PdfReader(sourceFolder + "illegalDifference.pdf"))) {
+                NUnit.Framework.Assert.DoesNotThrow(() => PdfTextExtractor.GetTextFromPage(pdf.GetFirstPage()));
+            }
+        }
+
+        [NUnit.Framework.Test]
+        [LogMessage(iText.IO.Logs.IoLogMessageConstant.DOCFONT_HAS_ILLEGAL_DIFFERENCES, Count = 2)]
+        public virtual void IllegalDifferenceType3Font() {
+            using (PdfDocument pdf = new PdfDocument(new PdfReader(sourceFolder + "illegalDifferenceType3Font.pdf"))) {
+                NUnit.Framework.Assert.DoesNotThrow(() => PdfTextExtractor.GetTextFromPage(pdf.GetFirstPage()));
+            }
         }
     }
 }
diff --git a/itext.tests/itext.kernel.tests/resources/itext/kernel/parser/TextExtractIllegalDifferencesTest/illegalDifferenceType3Font.pdf b/itext.tests/itext.kernel.tests/resources/itext/kernel/parser/TextExtractIllegalDifferencesTest/illegalDifferenceType3Font.pdf
diff --git a/itext/itext.kernel/itext/kernel/font/PdfType3Font.cs b/itext/itext.kernel/itext/kernel/font/PdfType3Font.cs
@@ -408,15 +408,20 @@ private void AddGlyphsFromDifferences(PdfArray differences, PdfDictionary charPr
                     currentNumber = ((PdfNumber)obj).IntValue();
                 }
                 else {
-                    String glyphName = ((PdfName)obj).GetValue();
-                    int unicode = fontEncoding.GetUnicode(currentNumber);
-                    if (GetFontProgram().GetGlyphByCode(currentNumber) == null && charProcsDic.ContainsKey(new PdfName(glyphName
-                        ))) {
-                        fontEncoding.SetDifference(currentNumber, glyphName);
-                        ((Type3Font)GetFontProgram()).AddGlyph(currentNumber, unicode, widths[currentNumber], null, new Type3Glyph
-                            (charProcsDic.GetAsStream(new PdfName(glyphName)), GetDocument()));
+                    if (currentNumber > SIMPLE_FONT_MAX_CHAR_CODE_VALUE) {
+                    }
+                    else {
+                        // Skip glyphs with id greater than 255
+                        String glyphName = ((PdfName)obj).GetValue();
+                        int unicode = fontEncoding.GetUnicode(currentNumber);
+                        if (GetFontProgram().GetGlyphByCode(currentNumber) == null && charProcsDic.ContainsKey(new PdfName(glyphName
+                            ))) {
+                            fontEncoding.SetDifference(currentNumber, glyphName);
+                            ((Type3Font)GetFontProgram()).AddGlyph(currentNumber, unicode, widths[currentNumber], null, new Type3Glyph
+                                (charProcsDic.GetAsStream(new PdfName(glyphName)), GetDocument()));
+                        }
+                        currentNumber++;
                     }
-                    currentNumber++;
                 }
             }
         }
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-b57af5ffa23b49bfb3dc4c740bc5d67d04692c60
+c09528c66d2bb0e1b95bed9b284d9aeba778faaf

Original file line number	Diff line number	Diff line change
`@@ -408,15 +408,20 @@ private void AddGlyphsFromDifferences(PdfArray differences, PdfDictionary charPr`
`408`	`408`	`currentNumber = ((PdfNumber)obj).IntValue();`
`409`	`409`	`}`
`410`	`410`	`else {`
`411`		`- String glyphName = ((PdfName)obj).GetValue();`
`412`		`- int unicode = fontEncoding.GetUnicode(currentNumber);`
`413`		`- if (GetFontProgram().GetGlyphByCode(currentNumber) == null && charProcsDic.ContainsKey(new PdfName(glyphName`
`414`		`- ))) {`
`415`		`- fontEncoding.SetDifference(currentNumber, glyphName);`
`416`		`- ((Type3Font)GetFontProgram()).AddGlyph(currentNumber, unicode, widths[currentNumber], null, new Type3Glyph`
`417`		`- (charProcsDic.GetAsStream(new PdfName(glyphName)), GetDocument()));`
	`411`	`+ if (currentNumber > SIMPLE_FONT_MAX_CHAR_CODE_VALUE) {`
	`412`	`+ }`
	`413`	`+ else {`
	`414`	`+ // Skip glyphs with id greater than 255`
	`415`	`+ String glyphName = ((PdfName)obj).GetValue();`
	`416`	`+ int unicode = fontEncoding.GetUnicode(currentNumber);`
	`417`	`+ if (GetFontProgram().GetGlyphByCode(currentNumber) == null && charProcsDic.ContainsKey(new PdfName(glyphName`
	`418`	`+ ))) {`
	`419`	`+ fontEncoding.SetDifference(currentNumber, glyphName);`
	`420`	`+ ((Type3Font)GetFontProgram()).AddGlyph(currentNumber, unicode, widths[currentNumber], null, new Type3Glyph`
	`421`	`+ (charProcsDic.GetAsStream(new PdfName(glyphName)), GetDocument()));`
	`422`	`+ }`
	`423`	`+ currentNumber++;`
`418`	`424`	`}`
`419`		`- currentNumber++;`
`420`	`425`	`}`
`421`	`426`	`}`
`422`	`427`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b57af5ffa23b49bfb3dc4c740bc5d67d04692c60`
	`1`	`+c09528c66d2bb0e1b95bed9b284d9aeba778faaf`