summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_parser.cpp
diff options
context:
space:
mode:
authorArtem Strygin <art-snake@yandex-team.ru>2018-06-27 17:52:40 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-06-27 17:52:40 +0000
commit9e12f14814722c0c0d46d4968f636b5e1a72a1e7 (patch)
tree540394b17d4f94227bec1064ebedbd475f88a26c /core/fpdfapi/parser/cpdf_parser.cpp
parent2d7cb9267899902ce455165303e2373ac38c867d (diff)
downloadpdfium-9e12f14814722c0c0d46d4968f636b5e1a72a1e7.tar.xz
Implement CPDF_CrossRefTable
Change-Id: I5ac61ab323adb5eec2de8660064fff95ee877b5e Reviewed-on: https://pdfium-review.googlesource.com/35432 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Art Snake <art-snake@yandex-team.ru>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_parser.cpp')
-rw-r--r--core/fpdfapi/parser/cpdf_parser.cpp75
1 files changed, 26 insertions, 49 deletions
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp
index 3a7afd0b49..c7a3fe16c8 100644
--- a/core/fpdfapi/parser/cpdf_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_parser.cpp
@@ -670,6 +670,7 @@ bool CPDF_Parser::LoadAllCrossRefV5(FX_FILESIZE xrefpos) {
}
bool CPDF_Parser::RebuildCrossRef() {
+ CPDF_CrossRefTable cross_ref_table;
m_ObjectInfo.clear();
m_TrailerData->Clear();
@@ -826,23 +827,14 @@ bool CPDF_Parser::RebuildCrossRef() {
CPDF_Object* pRoot = pDict->GetObjectFor("Root");
if (pRoot && pRoot->GetDict() &&
pRoot->GetDict()->GetObjectFor("Pages")) {
- m_TrailerData->SetMainTrailer(
- ToDictionary(pDict->Clone()));
+ cross_ref_table.Update(
+ pdfium::MakeUnique<CPDF_CrossRefTable>(
+ ToDictionary(pDict->Clone())));
}
}
}
}
- ObjectInfo& info = m_ObjectInfo[objnum];
- if (pObject || !info.pos) {
- info.pos = obj_pos;
- info.type = ObjectType::kNotCompressed;
- // The newer version of object should be located after old
- // version.
- // Do not worry about gennum in this case, because we read
- // file
- // in front order.
- info.gennum = gennum;
- }
+ cross_ref_table.AddNormal(objnum, gennum, obj_pos);
}
state = ParserState::kDefault;
break;
@@ -859,42 +851,21 @@ bool CPDF_Parser::RebuildCrossRef() {
if (!pObj)
m_pSyntax->SetPos(current_char_pos);
- {
- if (pObj && (pObj->IsDictionary() || pObj->IsStream())) {
- if (CPDF_Dictionary* pTrailer =
- pObj->IsStream() ? pObj->AsStream()->GetDict()
- : pObj->AsDictionary()) {
- if (GetTrailer()) {
- CPDF_Object* pRoot = pTrailer->GetObjectFor("Root");
- CPDF_Reference* pRef = ToReference(pRoot);
- if (!pRoot ||
- (pRef && IsValidObjectNumber(pRef->GetRefObjNum()) &&
- m_ObjectInfo[pRef->GetRefObjNum()].pos != 0)) {
- // This is newer version of trailer. Merge it with old.
- for (auto it = pTrailer->begin();
- it != pTrailer->end();) {
- DCHECK(it->second->IsInline());
- const ByteString key = it->first;
- ++it;
- GetTrailer()->SetFor(key, pTrailer->RemoveFor(key));
- }
- }
- } else {
- m_TrailerData->SetMainTrailer(
- ToDictionary(pObj->IsStream() ? pTrailer->Clone()
- : std::move(pObj)));
-
- FX_FILESIZE dwSavePos = m_pSyntax->GetPos();
- ByteString strWord = m_pSyntax->GetKeyword();
- if (!strWord.Compare("startxref")) {
- bool bNumber;
- ByteString bsOffset = m_pSyntax->GetNextWord(&bNumber);
- if (bNumber)
- m_LastXRefOffset = FXSYS_atoi(bsOffset.c_str());
- }
- m_pSyntax->SetPos(dwSavePos);
- }
- }
+ if (pObj) {
+ cross_ref_table.Update(pdfium::MakeUnique<CPDF_CrossRefTable>(
+ ToDictionary(pObj->IsStream()
+ ? pObj->AsStream()->GetDict()->Clone()
+ : std::move(pObj))));
+
+ FX_FILESIZE dwSavePos = m_pSyntax->GetPos();
+ ByteString strWord = m_pSyntax->GetKeyword();
+ if (!strWord.Compare("startxref")) {
+ bool bNumber;
+ ByteString bsOffset = m_pSyntax->GetNextWord(&bNumber);
+ if (bNumber)
+ last_xref = FXSYS_atoi(bsOffset.c_str());
+ } else {
+ m_pSyntax->SetPos(dwSavePos);
}
}
}
@@ -972,8 +943,14 @@ bool CPDF_Parser::RebuildCrossRef() {
else if (last_trailer == -1 || last_xref < last_obj)
last_trailer = m_pSyntax->m_FileLen;
+ if (cross_ref_table.trailer()) {
+ m_TrailerData->SetMainTrailer(
+ ToDictionary(cross_ref_table.trailer()->Clone()));
+ m_ObjectInfo = cross_ref_table.objects_info();
+ }
// Resore default buffer size.
m_pSyntax->SetReadBufferSize(CPDF_ModuleMgr::kFileBufSize);
+
return GetTrailer() && !m_ObjectInfo.empty();
}