diff options
author | Lei Zhang <thestig@chromium.org> | 2015-12-11 19:09:11 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-12-11 19:09:11 -0800 |
commit | 7554490c37069879f302d9de07eff5d486518c59 (patch) | |
tree | d040509afec3d87326238558a999da0bf9cfa750 /core/src/fpdfapi/fpdf_parser | |
parent | f75bdb181576e4a4cf8291706a0db86c687e5fc3 (diff) | |
download | pdfium-7554490c37069879f302d9de07eff5d486518c59.tar.xz |
Merge to XFA: Fix a regression for parsing '/' - commit a568ff2d was too strict.
BUG=pdfium:326
TBR=dml@google.com
Review URL: https://codereview.chromium.org/1521543002 .
(cherry picked from commit ebc7695c60fc3e4afbfa6d9db162a71b190bf685)
Review URL: https://codereview.chromium.org/1519323002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser')
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index bc5d3edc2b..ca3a5f67a2 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -2125,10 +2125,6 @@ CPDF_Object* CPDF_SyntaxParser::GetObject(CPDF_IndirectObjects* pObjList, if (key.IsEmpty()) continue; - CFX_ByteStringC keyNoSlash(key.c_str() + 1, key.GetLength() - 1); - if (keyNoSlash.IsEmpty()) - continue; - if (key == FX_BSTRC("/Contents")) dwSignValuePos = m_Pos; @@ -2136,6 +2132,7 @@ CPDF_Object* CPDF_SyntaxParser::GetObject(CPDF_IndirectObjects* pObjList, if (!pObj) continue; + CFX_ByteStringC keyNoSlash(key.c_str() + 1, key.GetLength() - 1); // TODO(thestig): Remove this conditional once CPDF_Dictionary has a // better underlying map implementation. if (nKeys < 32) { |