diff options
author | Lei Zhang <thestig@chromium.org> | 2015-09-25 22:51:39 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-09-25 22:51:39 -0700 |
commit | 37890560caa14fc54b237bb4928a4e843cc635b8 (patch) | |
tree | 937392bb75db137b5e8d1a00e9903997088e3d66 /core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp | |
parent | 07117051899498130a85f87e22b902eda03342b9 (diff) | |
download | pdfium-37890560caa14fc54b237bb4928a4e843cc635b8.tar.xz |
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 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp index 48e9b98d3a..c9bcff6db6 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp @@ -9,27 +9,7 @@ #include "../../../include/fxcodec/fx_codec.h" #include "pageint.h" #include <limits.h> -const FX_CHAR* const _PDF_OpCharType = - "IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII" - "IIVIIIIVIIVIIIIIVVIIIIIIIIIIIIII" - "IIVVVVVVIVVVVVVIVVVVVIIVVIIIIIII" - "IIVVVVVVVVVVVVVVIVVVIIVVIVVIIIII" - "IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII" - "IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII" - "IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII" - "IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII"; -FX_BOOL _PDF_HasInvalidOpChar(const FX_CHAR* op) { - if (!op) { - return FALSE; - } - uint8_t ch; - while ((ch = *op++)) { - if (_PDF_OpCharType[ch] == 'I') { - return TRUE; - } - } - return FALSE; -} + class CPDF_StreamParserAutoClearer { public: CPDF_StreamParserAutoClearer(CPDF_StreamParser** scoped_variable, @@ -61,13 +41,7 @@ FX_DWORD CPDF_StreamContentParser::Parse(const uint8_t* pData, case CPDF_StreamParser::EndOfData: return m_pSyntax->GetPos(); case CPDF_StreamParser::Keyword: - if (!OnOperator((char*)syntax.GetWordBuf()) && - _PDF_HasInvalidOpChar((char*)syntax.GetWordBuf())) { - m_bAbort = TRUE; - } - if (m_bAbort) { - return m_pSyntax->GetPos(); - } + OnOperator((char*)syntax.GetWordBuf()); ClearAllParams(); break; case CPDF_StreamParser::Number: @@ -1126,10 +1100,6 @@ void CPDF_ContentParser::Continue(IFX_Pause* pPause) { m_CurrentOffset += m_pParser->Parse(m_pData + m_CurrentOffset, m_Size - m_CurrentOffset, PARSE_STEP_LIMIT); - if (m_pParser->ShouldAbort()) { - m_InternalStage = PAGEPARSE_STAGE_CHECKCLIP; - continue; - } } } if (m_InternalStage == PAGEPARSE_STAGE_CHECKCLIP) { |