From 37890560caa14fc54b237bb4928a4e843cc635b8 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 25 Sep 2015 22:51:39 -0700 Subject: Merge to XFA: Fix the issue that pdfium swallows 'fi' or 'ff' in some pdf files Pdfium swallows 'fi' or 'ff' in some tested files because it doesn't load the embedded font file correctly. The root cause is that there is incorrect keyword like 'ngendstream' in the stream of the embedded font file. Pdfium tries to find another correct keyword but uses wrong offset rather than accumulated offset. BUG=524043 TBR=jun_fang@foxitsoftware.com Review URL: https://codereview.chromium.org/1307353005 . (cherry picked from commit 9bd18183ba8210c91d71c3060146235750a4c71c) Review URL: https://codereview.chromium.org/1365253003 . --- core/include/fpdfapi/fpdf_parser.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/include/fpdfapi') diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index 03ae4cf570..6194247568 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -294,7 +294,8 @@ class CPDF_SyntaxParser { FX_BOOL IsWholeWord(FX_FILESIZE startpos, FX_FILESIZE limit, const uint8_t* tag, - FX_DWORD taglen); + FX_DWORD taglen, + FX_BOOL checkKeyword); CFX_ByteString ReadString(); -- cgit v1.2.3