diff options
| author | npm <npm@chromium.org> | 2016-10-21 09:42:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-21 09:42:33 -0700 |
| commit | fd5ae3f7cf077d00af0ce3082376f4051c499c5d (patch) | |
| tree | c50f211d8efca99e9ec17733a776fca854c3f78c /core/fpdfapi/parser/cpdf_data_avail.cpp | |
| parent | ef38283688c1ee7c08bcf4204cfb78e09c039782 (diff) | |
| download | pdfium-fd5ae3f7cf077d00af0ce3082376f4051c499c5d.tar.xz | |
Revert of Fix loading page using hint tables. (patchset #5 id:80001 of https://codereview.chromium.org/2437773003/ )
Reason for revert:
CPDF_DataAvail::IsPageAvail is causing crashes.
BUG=chromium:658168, chromium:658170
Original issue's description:
> Fix loading page using hint tables.
>
> When linearized document have hint table,
> The FPDFAvail_IsPageAvail return true, but
> FPDF_LoadPage return nullptr, for non first pages.
>
> This happens, bacause document not use hint tables, to load page.
>
> To fix this, I force save the page's ObjNum in document.
>
> R=npm, dsinclair
>
> Committed: https://pdfium.googlesource.com/pdfium/+/ef38283688c1ee7c08bcf4204cfb78e09c039782
TBR=dsinclair@chromium.org,tsepez@chromium.org,thestig@chromium.org,art-snake@yandex-team.ru
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://chromiumcodereview.appspot.com/2442663005
Diffstat (limited to 'core/fpdfapi/parser/cpdf_data_avail.cpp')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_data_avail.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp index e52d0611f9..e23aa8ecfb 100644 --- a/core/fpdfapi/parser/cpdf_data_avail.cpp +++ b/core/fpdfapi/parser/cpdf_data_avail.cpp @@ -1625,8 +1625,6 @@ CPDF_DataAvail::DocAvailStatus CPDF_DataAvail::IsPageAvail( nResult = m_pHintTables->CheckPage(dwPage, pHints); if (nResult != DataAvailable) return nResult; - // We should say to the document, which object is the page. - m_pDocument->SetPageObjNum(dwPage, GetPage(dwPage)->GetObjNum()); m_pagesLoadState.insert(dwPage); return DataAvailable; } @@ -1765,18 +1763,11 @@ CPDF_Dictionary* CPDF_DataAvail::GetPage(int index) { uint32_t dwObjNum = 0; bool bPagePosGot = m_pHintTables->GetPagePos(index, &szPageStartPos, &szPageLength, &dwObjNum); - if (!dwObjNum) - return nullptr; - // Page object already can be parsed in document. - CPDF_Object* pPageDict = m_pDocument->GetIndirectObject(dwObjNum); - if (pPageDict) - return pPageDict->GetDict(); - if (!bPagePosGot) return nullptr; m_syntaxParser.InitParser(m_pFileRead, (uint32_t)szPageStartPos); - pPageDict = ParseIndirectObjectAt(0, dwObjNum, m_pDocument); + CPDF_Object* pPageDict = ParseIndirectObjectAt(0, dwObjNum, m_pDocument); if (!pPageDict) return nullptr; |