diff options
author | Lei Zhang <thestig@chromium.org> | 2015-09-08 17:27:17 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-09-08 17:27:17 -0700 |
commit | 288c6babb0b6ccdfc1eb4c5ea9a58cdf7b40b653 (patch) | |
tree | a83a80596ec809997a012d52108423b405c3d131 | |
parent | 6a6dacd4fd45ec9bc2af97c8f505787c0f4c986f (diff) | |
download | pdfium-288c6babb0b6ccdfc1eb4c5ea9a58cdf7b40b653.tar.xz |
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 .
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp | 35 |
1 files 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<CPDF_Dictionary*>(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<CPDF_Dictionary*>(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, |