From 288c6babb0b6ccdfc1eb4c5ea9a58cdf7b40b653 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 8 Sep 2015 17:27:17 -0700 Subject: Merge to M46: Turn a failing assert into an actual check. BUG=522131 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1327913002 . (cherry picked from commit 640c395fa9b76552383ccd0c5f4668ea698089f6) Review URL: https://codereview.chromium.org/1310333007 . --- .../fpdfapi/fpdf_parser/fpdf_parser_document.cpp | 35 ++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp index 0d7bdd8379..8bdd23bece 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp @@ -137,37 +137,42 @@ CPDF_Dictionary* CPDF_Document::_FindPDFPage(CPDF_Dictionary* pPages, } return NULL; } + CPDF_Dictionary* CPDF_Document::GetPage(int iPage) { - if (iPage < 0 || iPage >= m_PageList.GetSize()) { - return NULL; - } + if (iPage < 0 || iPage >= m_PageList.GetSize()) + return nullptr; + if (m_bLinearized && (iPage == (int)m_dwFirstPageNo)) { CPDF_Object* pObj = GetIndirectObject(m_dwFirstPageObjNum); if (pObj && pObj->GetType() == PDFOBJ_DICTIONARY) { - return (CPDF_Dictionary*)pObj; + return static_cast(pObj); } } + int objnum = m_PageList.GetAt(iPage); if (objnum) { CPDF_Object* pObj = GetIndirectObject(objnum); - ASSERT(pObj->GetType() == PDFOBJ_DICTIONARY); - return (CPDF_Dictionary*)pObj; + if (pObj && pObj->GetType() == PDFOBJ_DICTIONARY) { + return static_cast(pObj); + } } + CPDF_Dictionary* pRoot = GetRoot(); - if (pRoot == NULL) { - return NULL; - } + if (!pRoot) + return nullptr; + CPDF_Dictionary* pPages = pRoot->GetDict(FX_BSTRC("Pages")); - if (pPages == NULL) { - return NULL; - } + if (!pPages) + return nullptr; + CPDF_Dictionary* pPage = _FindPDFPage(pPages, iPage, iPage, 0); - if (pPage == NULL) { - return NULL; - } + if (!pPage) + return nullptr; + m_PageList.SetAt(iPage, pPage->GetObjNum()); return pPage; } + int CPDF_Document::_FindPageIndex(CPDF_Dictionary* pNode, FX_DWORD& skip_count, FX_DWORD objnum, -- cgit v1.2.3