From 4ea4459ecaf66043f0a8b29f60439a0056ff6036 Mon Sep 17 00:00:00 2001 From: Jun Fang Date: Fri, 11 Dec 2015 21:47:04 -0800 Subject: Fix memory leaks involving InsertIndirectObject() BUG=447331 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1514093002 . --- core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to '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 ca3a5f67a2..61d9749c8e 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -987,16 +987,17 @@ 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); + bInserted = m_pDocument->InsertIndirectObject(pObject->m_ObjNum, pObject); } else { if (pObject->IsStream()) pObject->Release(); - return FALSE; } + if (!bInserted) + return FALSE; } CPDF_Stream* pStream = pObject->AsStream(); @@ -4553,7 +4554,8 @@ CPDF_Dictionary* CPDF_DataAvail::GetPage(int index) { if (!pPageDict) { return nullptr; } - m_pDocument->InsertIndirectObject(dwObjNum, pPageDict); + if (!m_pDocument->InsertIndirectObject(dwObjNum, pPageDict)) + return nullptr; return pPageDict->GetDict(); } } -- cgit v1.2.3