Attachment 26343 Details for Bug 22025 – suggested patch to poppler-0.10.7/poppler/CharCodeToUnicode.cc

[patch] suggested patch to poppler-0.10.7/poppler/CharCodeToUnicode.cc

poppler-0.10.7-charcode.pat (text/plain), 1.10 KB, created by William Bader on 2009-06-01 14:31:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2009-06-01 14:31:46 UTC

Size: 1.10 KB

patch

obsolete

>--- poppler-0.10.7/poppler/CharCodeToUnicode.cc-	2009-05-02 14:14:56.000000000 +0200
>+++ poppler-0.10.7/poppler/CharCodeToUnicode.cc	2009-06-01 22:24:17.000000000 +0200
>@@ -279,7 +279,8 @@
> 	  error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
> 	  break;
> 	}
>-	if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' &&
>+	/* 29May09 wb Change n1 == 2 + nDigits to >= because some PDF files have an extra two leading zeros */
>+	if (!(n1 >= 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' &&
> 	      tok2[0] == '<' && tok2[n2 - 1] == '>')) {
> 	  error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
> 	  continue;
>@@ -289,6 +290,11 @@
> 	  error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
> 	  continue;
> 	}
>+	/* 29May09 wb Check that the code is in range after the previous change from == to >= 2 + nDigits */
>+	if (code1 >= (1L << nBits)) {
>+	  error(-1, "Illegal entry in bfchar block in ToUnicode CMap, beginbfchar followed by code %d > %d", code1, (1 << nBits));
>+	  continue;
>+	}
> 	addMapping(code1, tok2 + 1, n2 - 2, 0);
>       }
>       pst->getToken(tok1, sizeof(tok1), &n1);

Actions: View | Splinter Review

Attachments on bug 22025: 26343

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.