Fix memory leaks involving InsertIndirectObject()

core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "parser_int.h"
 
 #include <set>
 #include <utility>
@@ skipping 969 matching lines @@
     m_SortedOffset.Add(offset);
   }
   FX_Free(buffer);
   return m_pTrailer && m_CrossRef.GetSize() > 0;
 }
 
 FX_BOOL CPDF_Parser::LoadCrossRefV5(FX_FILESIZE* pos, FX_BOOL bMainXRef) {
   CPDF_Object* pObject = ParseIndirectObjectAt(m_pDocument, *pos, 0, nullptr);
   if (!pObject)
     return FALSE;
-
   if (m_pDocument) {
+    FX_BOOL bInserted = FALSE;
     CPDF_Dictionary* pDict = m_pDocument->GetRoot();
-    if (!pDict || pDict->GetObjNum() != pObject->m_ObjNum) {
-      m_pDocument->InsertIndirectObject(pObject->m_ObjNum, pObject);
-    } else {
+    if ((!pDict || pDict->GetObjNum() != pObject->m_ObjNum))

[Tom Sepez, 2015/12/10 17:32:13]

nit: overparenthesized.
nit: use { here.  The rule is that if the else has braces, then so does the if,
even if it would be a single-line if otherwise and wouldn't get braces.

[jun_fang, 2015/12/10 23:24:26]

Acknowledged.

+      bInserted = m_pDocument->InsertIndirectObject(pObject->m_ObjNum, pObject);
+    else {
       if (pObject->IsStream())
         pObject->Release();
+      bInserted = FALSE;

[Tom Sepez, 2015/12/10 17:32:13]

nit: bInserted is already false.

[jun_fang, 2015/12/10 23:24:26]

Acknowledged.

+    }
+    if (!bInserted)
       return FALSE;
-    }
   }
 
   CPDF_Stream* pStream = pObject->AsStream();
   if (!pStream)
     return FALSE;
 
   *pos = pStream->GetDict()->GetInteger(FX_BSTRC("Prev"));
   int32_t size = pStream->GetDict()->GetInteger(FX_BSTRC("Size"));
   if (size < 0) {
     pStream->Release();
@@ skipping 3539 matching lines @@
       FX_BOOL bPagePosGot = m_pHintTables->GetPagePos(index, szPageStartPos,
                                                       szPageLength, dwObjNum);
       if (!bPagePosGot) {
         return nullptr;
       }
       m_syntaxParser.InitParser(m_pFileRead, (FX_DWORD)szPageStartPos);
       CPDF_Object* pPageDict = ParseIndirectObjectAt(0, dwObjNum, m_pDocument);
       if (!pPageDict) {
         return nullptr;
       }
-      m_pDocument->InsertIndirectObject(dwObjNum, pPageDict);
+      if (!m_pDocument->InsertIndirectObject(dwObjNum, pPageDict))
+        return nullptr;
       return pPageDict->GetDict();
     }
   }
   return m_pDocument->GetPage(index);
 }
 IPDF_DataAvail::DocFormStatus CPDF_DataAvail::IsFormAvail(
     IFX_DownloadHints* pHints) {
   if (!m_pDocument) {
     return FormAvailable;
   }
@@ skipping 380 matching lines @@
   if (!m_pLinearizedDict)
     return -1;
   CPDF_Array* pRange = m_pLinearizedDict->GetArray(FX_BSTRC("H"));
   if (!pRange)
     return -1;
   CPDF_Object* pStreamLen = pRange->GetElementValue(1);
   if (!pStreamLen)
     return -1;
   return pStreamLen->GetInteger();
 }