commit a568ff2dddd3ef44f224d21b31afff8eb14b6d31
author Lei Zhang <thestig@chromium.org> Mon Oct 26 13:54:28 2015 -0700
committer Lei Zhang <thestig@chromium.org> Mon Oct 26 13:54:28 2015 -0700
tree 67266204d8297ebc5093695911eebb3ae809eed1
parent 95d25e4585358c74ae91c2ed5e08099ebbfdf24c

Fix a leak in CPDF_SyntaxParser::GetObject().

As seen in FPDFViewEmbeddertest.Crasher_451830.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1385803002 .

core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp

diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
index d486cfe..27cc868 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
@@ -2139,6 +2139,13 @@
 
       ++nKeys;
       key = PDF_NameDecode(key);
+      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;
 
@@ -2146,14 +2153,12 @@
       if (!pObj)
         continue;
 
-      if (key.GetLength() >= 1) {
-        if (nKeys < 32) {
-          pDict->SetAt(CFX_ByteStringC(key.c_str() + 1, key.GetLength() - 1),
-                       pObj);
-        } else {
-          pDict->AddValue(CFX_ByteStringC(key.c_str() + 1, key.GetLength() - 1),
-                          pObj);
-        }
+      // TODO(thestig): Remove this conditional once CPDF_Dictionary has a
+      // better underlying map implementation.
+      if (nKeys < 32) {
+        pDict->SetAt(keyNoSlash, pObj);
+      } else {
+        pDict->AddValue(keyNoSlash, pObj);
       }
     }