diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-15 17:23:25 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-15 17:23:25 -0800 |
| commit | cd19dd08384a23b7c4993162b1b66018146082eb (patch) | |
| tree | d7ab8554ac23a951aad2305c7749d7aa3f52d3b2 | |
| parent | d0c1fe5706a2e1d13425f0f89a38d042d8551665 (diff) | |
| download | pdfium-cd19dd08384a23b7c4993162b1b66018146082eb.tar.xz | |
Merge to M48: Fix a regression for parsing '/' - commit a568ff2d was too strict.
BUG=pdfium:326
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1521543002 .
(cherry picked from commit ebc7695c60fc3e4afbfa6d9db162a71b190bf685)
Review URL: https://codereview.chromium.org/1529003002 .
| -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 fc2e70107d..bf6630bc0d 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -2122,10 +2122,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; @@ -2133,6 +2129,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) { |