summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-03-15 16:21:02 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-03-15 21:35:55 +0000
commitc467d4619ebe0bae9a87b667ca9a06f576138f68 (patch)
treeb5512ee33f689818458e6ab8f4376019b8a0811c /core
parentc8493852c7a07241c18e14cb0a8d6292b1314726 (diff)
downloadpdfium-c467d4619ebe0bae9a87b667ca9a06f576138f68.tar.xz
Reset tree traversal when we think we're at the startchromium/3043
If the PDF declares it has a gazillion pages when it does not, we just start traversing again from the start. This CL fixes that. BUG=chromium:680222 Change-Id: Ie9b55abc0aaa372429b3d995a7e1e7ab58fb7965 Reviewed-on: https://pdfium-review.googlesource.com/3060 Commit-Queue: Nicolás Peña <npm@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/parser/cpdf_document.cpp6
-rw-r--r--core/fpdfapi/parser/cpdf_document_unittest.cpp30
2 files changed, 28 insertions, 8 deletions
diff --git a/core/fpdfapi/parser/cpdf_document.cpp b/core/fpdfapi/parser/cpdf_document.cpp
index 8ff9e66506..c047085cf3 100644
--- a/core/fpdfapi/parser/cpdf_document.cpp
+++ b/core/fpdfapi/parser/cpdf_document.cpp
@@ -503,9 +503,11 @@ CPDF_Dictionary* CPDF_Document::GetPage(int iPage) {
// TODO(art-snake): optimize this.
ResetTraversal();
}
- int nPagesToGo = iPage - m_iNextPageToTraverse + 1;
- if (m_pTreeTraversal.empty())
+ if (m_pTreeTraversal.empty()) {
+ ResetTraversal();
m_pTreeTraversal.push_back(std::make_pair(pPages, 0));
+ }
+ int nPagesToGo = iPage - m_iNextPageToTraverse + 1;
CPDF_Dictionary* pPage = TraversePDFPages(iPage, &nPagesToGo, 0);
m_iNextPageToTraverse = iPage + 1;
return pPage;
diff --git a/core/fpdfapi/parser/cpdf_document_unittest.cpp b/core/fpdfapi/parser/cpdf_document_unittest.cpp
index 4815ffba52..379ca047a1 100644
--- a/core/fpdfapi/parser/cpdf_document_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_document_unittest.cpp
@@ -22,6 +22,8 @@
namespace {
+const int kNumTestPages = 7;
+
CPDF_Dictionary* CreatePageTreeNode(std::unique_ptr<CPDF_Array> kids,
CPDF_Document* pDoc,
int count) {
@@ -82,13 +84,18 @@ class CPDF_TestDocumentForPages : public CPDF_Document {
allPages->AddNew<CPDF_Reference>(this, branch3->GetObjNum());
allPages->AddNew<CPDF_Reference>(this, branch4->GetObjNum());
CPDF_Dictionary* pagesDict =
- CreatePageTreeNode(std::move(allPages), this, 7);
+ CreatePageTreeNode(std::move(allPages), this, kNumTestPages);
m_pOwnedRootDict = pdfium::MakeUnique<CPDF_Dictionary>();
m_pOwnedRootDict->SetNewFor<CPDF_Reference>("Pages", this,
pagesDict->GetObjNum());
m_pRootDict = m_pOwnedRootDict.get();
- m_PageList.resize(7);
+ m_PageList.resize(kNumTestPages);
+ }
+
+ void SetTreeSize(int size) {
+ m_pOwnedRootDict->SetNewFor<CPDF_Number>("Count", size);
+ m_PageList.resize(size);
}
private:
@@ -138,13 +145,13 @@ class cpdf_document_test : public testing::Test {
TEST_F(cpdf_document_test, GetPages) {
std::unique_ptr<CPDF_TestDocumentForPages> document =
pdfium::MakeUnique<CPDF_TestDocumentForPages>();
- for (int i = 0; i < 7; i++) {
+ for (int i = 0; i < kNumTestPages; i++) {
CPDF_Dictionary* page = document->GetPage(i);
ASSERT_TRUE(page);
ASSERT_TRUE(page->KeyExist("PageNumbering"));
EXPECT_EQ(i, page->GetIntegerFor("PageNumbering"));
}
- CPDF_Dictionary* page = document->GetPage(7);
+ CPDF_Dictionary* page = document->GetPage(kNumTestPages);
EXPECT_FALSE(page);
}
@@ -169,7 +176,7 @@ TEST_F(cpdf_document_test, GetPagesReverseOrder) {
ASSERT_TRUE(page->KeyExist("PageNumbering"));
EXPECT_EQ(i, page->GetIntegerFor("PageNumbering"));
}
- CPDF_Dictionary* page = document->GetPage(7);
+ CPDF_Dictionary* page = document->GetPage(kNumTestPages);
EXPECT_FALSE(page);
}
@@ -187,7 +194,7 @@ TEST_F(cpdf_document_test, GetPagesInDisorder) {
ASSERT_TRUE(page->KeyExist("PageNumbering"));
EXPECT_EQ(3, page->GetIntegerFor("PageNumbering"));
- page = document->GetPage(7);
+ page = document->GetPage(kNumTestPages);
EXPECT_FALSE(page);
page = document->GetPage(6);
@@ -219,3 +226,14 @@ TEST_F(cpdf_document_test, UseCachedPageObjNumIfHaveNotPagesDict) {
EXPECT_TRUE(document.IsPageLoaded(test_page_num));
EXPECT_EQ(page_stub, document.GetPage(test_page_num));
}
+
+TEST_F(cpdf_document_test, CountGreaterThanPageTree) {
+ std::unique_ptr<CPDF_TestDocumentForPages> document =
+ pdfium::MakeUnique<CPDF_TestDocumentForPages>();
+ document->SetTreeSize(kNumTestPages + 3);
+ for (int i = 0; i < kNumTestPages; i++)
+ EXPECT_TRUE(document->GetPage(i));
+ for (int i = kNumTestPages; i < kNumTestPages + 4; i++)
+ EXPECT_FALSE(document->GetPage(i));
+ EXPECT_TRUE(document->GetPage(kNumTestPages - 1));
+}