diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-08-09 08:05:00 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-09 08:05:00 +0000 |
| commit | 74557b1b4746bc80283f0acf248242fdcab71deb (patch) | |
| tree | f3eb45cc5c574d450537c4632a17dd3bc77c8bde /core/fpdfapi/parser/cpdf_parser.cpp | |
| parent | f765805983d157e9a21d7202ba49148f24d226f3 (diff) | |
| download | pdfium-74557b1b4746bc80283f0acf248242fdcab71deb.tar.xz | |
Revert "Rework of CPDF_Parser::GetLastObjNum."
This reverts commit b07deb3fc1f54bd700a66df573bfcbc4bcc1d787.
Reason for revert: Causing https://crbug.com/870467
Original change's description:
> Rework of CPDF_Parser::GetLastObjNum.
>
> Change-Id: I0481774858a9d9823580e1207807e35be8a9eea9
> Reviewed-on: https://pdfium-review.googlesource.com/36270
> Reviewed-by: Lei Zhang <thestig@chromium.org>
> Commit-Queue: Art Snake <art-snake@yandex-team.ru>
TBR=thestig@chromium.org,art-snake@yandex-team.ru
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I58e23c752a582c21be8ba45e3538e63c0fa64504
Reviewed-on: https://pdfium-review.googlesource.com/39810
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_parser.cpp')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_parser.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp index 9bb9bf22d7..029851570a 100644 --- a/core/fpdfapi/parser/cpdf_parser.cpp +++ b/core/fpdfapi/parser/cpdf_parser.cpp @@ -72,8 +72,9 @@ CPDF_Parser::~CPDF_Parser() { } uint32_t CPDF_Parser::GetLastObjNum() const { - const uint32_t size = m_CrossRefTable->GetSize(); - return size ? size - 1 : 0; + return m_CrossRefTable->objects_info().empty() + ? 0 + : m_CrossRefTable->objects_info().rbegin()->first; } bool CPDF_Parser::IsValidObjectNumber(uint32_t objnum) const { @@ -114,8 +115,8 @@ bool CPDF_Parser::IsObjectFree(uint32_t objnum) const { return GetObjectType(objnum) == ObjectType::kFree; } -void CPDF_Parser::ShrinkObjectMap(uint32_t max_size) { - m_CrossRefTable->ShrinkObjectMap(max_size); +void CPDF_Parser::ShrinkObjectMap(uint32_t objnum) { + m_CrossRefTable->ShrinkObjectMap(objnum); } bool CPDF_Parser::InitSyntaxParser( @@ -741,7 +742,8 @@ bool CPDF_Parser::LoadCrossRefV5(FX_FILESIZE* pos, bool bMainXRef) { const uint8_t* segstart = pData + segindex * totalWidth; FX_SAFE_UINT32 dwMaxObjNum = startnum; dwMaxObjNum += count; - uint32_t dwV5Size = m_CrossRefTable->GetSize(); + uint32_t dwV5Size = + m_CrossRefTable->objects_info().empty() ? 0 : GetLastObjNum() + 1; if (!dwMaxObjNum.IsValid() || dwMaxObjNum.ValueOrDie() > dwV5Size) continue; |