summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-09-03 14:51:53 -0700
committerLei Zhang <thestig@chromium.org>2015-09-03 14:51:53 -0700
commit6de7f2fa1faeb7aea117b6a9c650818425fe95dd (patch)
treedac3d96ce1bb06288df93befa4407027338c882a /core/src/fpdfapi
parent44aa03e275cab653aeca479b66d4f6e58183eb16 (diff)
downloadpdfium-6de7f2fa1faeb7aea117b6a9c650818425fe95dd.tar.xz
Merge to XFA: 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/1309263006 .
Diffstat (limited to 'core/src/fpdfapi')
-rw-r--r--core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp35
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 02ff1f3aca..5b78013694 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp
@@ -136,37 +136,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,