diff options
| author | art-snake <art-snake@yandex-team.ru> | 2016-11-07 08:42:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-07 08:42:04 -0800 |
| commit | 240dec52b2e6502e7deb27a3535af3b1a3e23428 (patch) | |
| tree | ead5a550c7988ac3291452e524296634423f3012 /core/fpdfapi/parser/cpdf_data_avail.h | |
| parent | a94fc11866adb1b9ca4a4e1afb4fb574ed472e07 (diff) | |
| download | pdfium-240dec52b2e6502e7deb27a3535af3b1a3e23428.tar.xz | |
Reland of Unify some code
Unify some code
Move parsing of linearized header into separate CPDF_Linearized class.
Original review:
https://codereview.chromium.org/2466023002/
Revert review:
https://codereview.chromium.org/2474283005/
Revert reason was:
Breaking the chrome roll.
See https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/331856
___
Added Fix for fuzzers.
Review-Url: https://codereview.chromium.org/2477213003
Diffstat (limited to 'core/fpdfapi/parser/cpdf_data_avail.h')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_data_avail.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/fpdfapi/parser/cpdf_data_avail.h b/core/fpdfapi/parser/cpdf_data_avail.h index 0a8716a498..bff9f2943b 100644 --- a/core/fpdfapi/parser/cpdf_data_avail.h +++ b/core/fpdfapi/parser/cpdf_data_avail.h @@ -16,6 +16,7 @@ class CPDF_Dictionary; class CPDF_HintTables; class CPDF_IndirectObjectHolder; +class CPDF_Linearized; class CPDF_Parser; enum PDF_DATAAVAIL_STATUS { @@ -199,7 +200,7 @@ class CPDF_DataAvail final { CPDF_Object* m_pRoot; uint32_t m_dwRootObjNum; uint32_t m_dwInfoObjNum; - CPDF_Object* m_pLinearized; + std::unique_ptr<CPDF_Linearized> m_pLinearized; CPDF_Object* m_pTrailer; bool m_bDocAvail; FX_FILESIZE m_dwHeaderOffset; @@ -220,8 +221,6 @@ class CPDF_DataAvail final { CFX_ArrayTemplate<uint32_t> m_XRefStreamList; CFX_ArrayTemplate<uint32_t> m_PageObjList; uint32_t m_PagesObjNum; - bool m_bLinearized; - uint32_t m_dwFirstPageNo; bool m_bLinearedDataOK; bool m_bMainXRefLoadTried; bool m_bMainXRefLoadedOK; |