summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser
diff options
context:
space:
mode:
authorArtem Strygin <art-snake@yandex-team.ru>2018-07-18 04:32:08 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-07-18 04:32:08 +0000
commit084c31d93439d5166c60dbfb0ccee6db1406d09c (patch)
treeb5a420219ca6fbd14b05395df8d9f2eac53b2202 /core/fpdfapi/parser
parenta18536af5b32b63f795d8b5812a4303c7ee6ea97 (diff)
downloadpdfium-084c31d93439d5166c60dbfb0ccee6db1406d09c.tar.xz
Use CPDF_CrossRefTable within CPDF_Parser
Change-Id: I354e8bed12606abdc67427bbc7928e3b1f11e243 Reviewed-on: https://pdfium-review.googlesource.com/35433 Commit-Queue: Art Snake <art-snake@yandex-team.ru> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser')
-rw-r--r--core/fpdfapi/parser/cpdf_cross_ref_table.cpp14
-rw-r--r--core/fpdfapi/parser/cpdf_cross_ref_table.h5
-rw-r--r--core/fpdfapi/parser/cpdf_parser.cpp227
-rw-r--r--core/fpdfapi/parser/cpdf_parser.h13
-rw-r--r--core/fpdfapi/parser/cpdf_parser_unittest.cpp30
5 files changed, 128 insertions, 161 deletions
diff --git a/core/fpdfapi/parser/cpdf_cross_ref_table.cpp b/core/fpdfapi/parser/cpdf_cross_ref_table.cpp
index 770c483dca..4be91745d8 100644
--- a/core/fpdfapi/parser/cpdf_cross_ref_table.cpp
+++ b/core/fpdfapi/parser/cpdf_cross_ref_table.cpp
@@ -8,6 +8,20 @@
#include "core/fpdfapi/parser/cpdf_dictionary.h"
+// static
+std::unique_ptr<CPDF_CrossRefTable> CPDF_CrossRefTable::MergeUp(
+ std::unique_ptr<CPDF_CrossRefTable> current,
+ std::unique_ptr<CPDF_CrossRefTable> top) {
+ if (!current)
+ return top;
+
+ if (!top)
+ return current;
+
+ current->Update(std::move(top));
+ return current;
+}
+
CPDF_CrossRefTable::CPDF_CrossRefTable() = default;
CPDF_CrossRefTable::CPDF_CrossRefTable(std::unique_ptr<CPDF_Dictionary> trailer)
diff --git a/core/fpdfapi/parser/cpdf_cross_ref_table.h b/core/fpdfapi/parser/cpdf_cross_ref_table.h
index ade1b336b2..9631216b0c 100644
--- a/core/fpdfapi/parser/cpdf_cross_ref_table.h
+++ b/core/fpdfapi/parser/cpdf_cross_ref_table.h
@@ -36,6 +36,11 @@ class CPDF_CrossRefTable {
uint16_t gennum;
};
+ // Merge cross reference tables. Apply top on current.
+ static std::unique_ptr<CPDF_CrossRefTable> MergeUp(
+ std::unique_ptr<CPDF_CrossRefTable> current,
+ std::unique_ptr<CPDF_CrossRefTable> top);
+
CPDF_CrossRefTable();
explicit CPDF_CrossRefTable(std::unique_ptr<CPDF_Dictionary> trailer);
~CPDF_CrossRefTable();
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp
index 8d4d7728ab..54e05245a9 100644
--- a/core/fpdfapi/parser/cpdf_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_parser.cpp
@@ -56,81 +56,13 @@ class ObjectsHolderStub : public CPDF_Parser::ParsedObjectsHolder {
} // namespace
-class CPDF_Parser::TrailerData {
- public:
- TrailerData() {}
- ~TrailerData() {}
-
- CPDF_Dictionary* GetMainTrailer() const { return main_trailer_.get(); }
-
- std::unique_ptr<CPDF_Dictionary> GetCombinedTrailer() const {
- std::unique_ptr<CPDF_Dictionary> result =
- ToDictionary(main_trailer_->Clone());
-
- // Info is optional.
- uint32_t info_obj_num = GetInfoObjNum();
- if (info_obj_num != CPDF_Object::kInvalidObjNum)
- result->SetNewFor<CPDF_Reference>("Info", nullptr, GetInfoObjNum());
-
- // Root is required.
- result->SetNewFor<CPDF_Reference>("Root", nullptr, GetRootObjNum());
- return result;
- }
-
- void SetMainTrailer(std::unique_ptr<CPDF_Dictionary> trailer) {
- ASSERT(trailer);
- main_trailer_ = std::move(trailer);
- ApplyTrailer(main_trailer_.get());
- }
-
- void AppendTrailer(std::unique_ptr<CPDF_Dictionary> trailer) {
- ASSERT(trailer);
- ApplyTrailer(trailer.get());
- }
-
- void Clear() {
- main_trailer_.reset();
- last_info_obj_num_ = CPDF_Object::kInvalidObjNum;
- last_root_obj_num_ = CPDF_Object::kInvalidObjNum;
- }
-
- uint32_t GetInfoObjNum() const {
- const CPDF_Reference* pRef = ToReference(
- GetMainTrailer() ? GetMainTrailer()->GetObjectFor("Info") : nullptr);
- return pRef ? pRef->GetRefObjNum() : last_info_obj_num_;
- }
-
- uint32_t GetRootObjNum() const {
- const CPDF_Reference* pRef = ToReference(
- GetMainTrailer() ? GetMainTrailer()->GetObjectFor("Root") : nullptr);
- return pRef ? pRef->GetRefObjNum() : last_root_obj_num_;
- }
-
- private:
- void ApplyTrailer(const CPDF_Dictionary* dict) {
- // The most recent Info object number contained in last added trailer.
- // See PDF 1.7 spec, section 3.4.5 - Incremental Updates.
- const auto* pRef = ToReference(dict->GetObjectFor("Info"));
- if (pRef)
- last_info_obj_num_ = pRef->GetRefObjNum();
-
- const auto* pRoot = ToReference(dict->GetObjectFor("Root"));
- if (pRoot)
- last_root_obj_num_ = pRoot->GetRefObjNum();
- }
-
- std::unique_ptr<CPDF_Dictionary> main_trailer_;
- uint32_t last_info_obj_num_ = CPDF_Object::kInvalidObjNum;
- uint32_t last_root_obj_num_ = CPDF_Object::kInvalidObjNum;
-};
-
CPDF_Parser::CPDF_Parser(ParsedObjectsHolder* holder)
: m_pSyntax(pdfium::MakeUnique<CPDF_SyntaxParser>()),
m_pObjectsHolder(holder),
m_bHasParsed(false),
m_bXRefStream(false),
m_FileVersion(0),
- m_TrailerData(pdfium::MakeUnique<TrailerData>()) {
+ m_CrossRefTable(pdfium::MakeUnique<CPDF_CrossRefTable>()) {
if (!holder) {
m_pOwnedObjectsHolder = pdfium::MakeUnique<ObjectsHolderStub>();
m_pObjectsHolder = m_pOwnedObjectsHolder.get();
@@ -144,28 +76,30 @@ CPDF_Parser::~CPDF_Parser() {
}
uint32_t CPDF_Parser::GetLastObjNum() const {
- return m_ObjectInfo.empty() ? 0 : m_ObjectInfo.rbegin()->first;
+ return m_CrossRefTable->objects_info().empty()
+ ? 0
+ : m_CrossRefTable->objects_info().rbegin()->first;
}
bool CPDF_Parser::IsValidObjectNumber(uint32_t objnum) const {
- return !m_ObjectInfo.empty() && objnum <= m_ObjectInfo.rbegin()->first;
+ return objnum <= GetLastObjNum();
}
FX_FILESIZE CPDF_Parser::GetObjectPositionOrZero(uint32_t objnum) const {
- auto it = m_ObjectInfo.find(objnum);
- return it != m_ObjectInfo.end() ? it->second.pos : 0;
+ const auto* info = m_CrossRefTable->GetObjectInfo(objnum);
+ return (info && info->type == ObjectType::kNormal) ? info->pos : 0;
}
CPDF_Parser::ObjectType CPDF_Parser::GetObjectType(uint32_t objnum) const {
ASSERT(IsValidObjectNumber(objnum));
- auto it = m_ObjectInfo.find(objnum);
- return it != m_ObjectInfo.end() ? it->second.type : ObjectType::kFree;
+ const auto* info = m_CrossRefTable->GetObjectInfo(objnum);
+ return info ? info->type : ObjectType::kFree;
}
uint16_t CPDF_Parser::GetObjectGenNum(uint32_t objnum) const {
ASSERT(IsValidObjectNumber(objnum));
- auto it = m_ObjectInfo.find(objnum);
- return it != m_ObjectInfo.end() ? it->second.gennum : 0;
+ const auto* info = m_CrossRefTable->GetObjectInfo(objnum);
+ return (info && info->type == ObjectType::kNormal) ? info->gennum : 0;
}
bool CPDF_Parser::IsObjectFreeOrNull(uint32_t objnum) const {
@@ -194,19 +128,7 @@ RetainPtr<IFX_SeekableReadStream> CPDF_Parser::GetFileAccess() const {
}
void CPDF_Parser::ShrinkObjectMap(uint32_t objnum) {
- if (objnum == 0) {
- m_ObjectInfo.clear();
- return;
- }
-
- auto it = m_ObjectInfo.lower_bound(objnum);
- while (it != m_ObjectInfo.end()) {
- auto saved_it = it++;
- m_ObjectInfo.erase(saved_it);
- }
-
- if (!pdfium::ContainsKey(m_ObjectInfo, objnum - 1))
- m_ObjectInfo[objnum - 1].pos = 0;
+ m_CrossRefTable->ShrinkObjectMap(objnum);
}
bool CPDF_Parser::InitSyntaxParser(
@@ -371,26 +293,12 @@ void CPDF_Parser::ReleaseEncryptHandler() {
SetEncryptDictionary(nullptr);
}
-FX_FILESIZE CPDF_Parser::GetObjectOffset(uint32_t objnum) const {
- if (!IsValidObjectNumber(objnum))
- return 0;
-
- if (GetObjectType(objnum) == ObjectType::kNotCompressed)
- return GetObjectPositionOrZero(objnum);
-
- if (GetObjectType(objnum) == ObjectType::kCompressed) {
- FX_FILESIZE pos = GetObjectPositionOrZero(objnum);
- return GetObjectPositionOrZero(pos);
- }
- return 0;
-}
-
// Ideally, all the cross reference entries should be verified.
// In reality, we rarely see well-formed cross references don't match
// with the objects. crbug/602650 showed a case where object numbers
// in the cross reference table are all off by one.
bool CPDF_Parser::VerifyCrossRefV4() {
- for (const auto& it : m_ObjectInfo) {
+ for (const auto& it : m_CrossRefTable->objects_info()) {
if (it.second.pos == 0)
continue;
// Find the first non-zero position.
@@ -418,7 +326,7 @@ bool CPDF_Parser::LoadAllCrossRefV4(FX_FILESIZE xrefpos) {
if (!trailer)
return false;
- m_TrailerData->SetMainTrailer(std::move(trailer));
+ m_CrossRefTable->SetTrailer(std::move(trailer));
int32_t xrefsize = GetDirectInteger(GetTrailer(), "Size");
if (xrefsize > 0 && xrefsize <= kMaxXRefSize)
ShrinkObjectMap(xrefsize);
@@ -454,7 +362,10 @@ bool CPDF_Parser::LoadAllCrossRefV4(FX_FILESIZE xrefpos) {
// SLOW ...
XRefStreamList.insert(XRefStreamList.begin(),
pDict->GetIntegerFor("XRefStm"));
- m_TrailerData->AppendTrailer(std::move(pDict));
+
+ m_CrossRefTable = CPDF_CrossRefTable::MergeUp(
+ pdfium::MakeUnique<CPDF_CrossRefTable>(std::move(pDict)),
+ std::move(m_CrossRefTable));
}
for (size_t i = 0; i < CrossRefList.size(); ++i) {
@@ -478,7 +389,10 @@ bool CPDF_Parser::LoadLinearizedAllCrossRefV4(FX_FILESIZE xrefpos) {
if (!trailer)
return false;
- m_TrailerData->SetMainTrailer(std::move(trailer));
+ m_CrossRefTable = CPDF_CrossRefTable::MergeUp(
+ pdfium::MakeUnique<CPDF_CrossRefTable>(std::move(trailer)),
+ std::move(m_CrossRefTable));
+
int32_t xrefsize = GetDirectInteger(GetTrailer(), "Size");
if (xrefsize == 0)
return false;
@@ -512,7 +426,10 @@ bool CPDF_Parser::LoadLinearizedAllCrossRefV4(FX_FILESIZE xrefpos) {
// SLOW ...
XRefStreamList.insert(XRefStreamList.begin(),
pDict->GetIntegerFor("XRefStm"));
- m_TrailerData->AppendTrailer(std::move(pDict));
+
+ m_CrossRefTable = CPDF_CrossRefTable::MergeUp(
+ pdfium::MakeUnique<CPDF_CrossRefTable>(std::move(pDict)),
+ std::move(m_CrossRefTable));
}
for (size_t i = 1; i < CrossRefList.size(); ++i) {
@@ -660,7 +577,21 @@ bool CPDF_Parser::LoadCrossRefV4(FX_FILESIZE pos, bool bSkip) {
void CPDF_Parser::MergeCrossRefObjectsData(
const std::vector<CrossRefObjData>& objects) {
for (const auto& obj : objects) {
- m_ObjectInfo[obj.obj_num] = obj.info;
+ switch (obj.info.type) {
+ case ObjectType::kFree:
+ if (obj.info.gennum > 0)
+ m_CrossRefTable->SetFree(obj.obj_num);
+ break;
+ case ObjectType::kNormal:
+ case ObjectType::kObjStream:
+ m_CrossRefTable->AddNormal(obj.obj_num, obj.info.gennum, obj.info.pos);
+ break;
+ case ObjectType::kCompressed:
+ m_CrossRefTable->AddCompressed(obj.obj_num, obj.info.archive_obj_num);
+ break;
+ default:
+ NOTREACHED();
+ }
}
}
@@ -684,9 +615,7 @@ bool CPDF_Parser::LoadAllCrossRefV5(FX_FILESIZE xrefpos) {
}
bool CPDF_Parser::RebuildCrossRef() {
- CPDF_CrossRefTable cross_ref_table;
- m_ObjectInfo.clear();
- m_TrailerData->Clear();
+ auto cross_ref_table = pdfium::MakeUnique<CPDF_CrossRefTable>();
ParserState state = ParserState::kDefault;
int32_t inside_index = 0;
@@ -841,14 +770,14 @@ bool CPDF_Parser::RebuildCrossRef() {
CPDF_Object* pRoot = pDict->GetObjectFor("Root");
if (pRoot && pRoot->GetDict() &&
pRoot->GetDict()->GetObjectFor("Pages")) {
- cross_ref_table.Update(
+ cross_ref_table->Update(
pdfium::MakeUnique<CPDF_CrossRefTable>(
ToDictionary(pDict->Clone())));
}
}
}
}
- cross_ref_table.AddNormal(objnum, gennum, obj_pos);
+ cross_ref_table->AddNormal(objnum, gennum, obj_pos);
}
state = ParserState::kDefault;
break;
@@ -866,7 +795,7 @@ bool CPDF_Parser::RebuildCrossRef() {
m_pSyntax->SetPos(current_char_pos);
if (pObj) {
- cross_ref_table.Update(pdfium::MakeUnique<CPDF_CrossRefTable>(
+ cross_ref_table->Update(pdfium::MakeUnique<CPDF_CrossRefTable>(
ToDictionary(pObj->IsStream()
? pObj->AsStream()->GetDict()->Clone()
: std::move(pObj))));
@@ -957,15 +886,12 @@ 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();
- }
+ m_CrossRefTable = CPDF_CrossRefTable::MergeUp(std::move(m_CrossRefTable),
+ std::move(cross_ref_table));
// Resore default buffer size.
m_pSyntax->SetReadBufferSize(CPDF_ModuleMgr::kFileBufSize);
- return GetTrailer() && !m_ObjectInfo.empty();
+ return GetTrailer() && !m_CrossRefTable->objects_info().empty();
}
bool CPDF_Parser::LoadCrossRefV5(FX_FILESIZE* pos, bool bMainXRef) {
@@ -989,12 +915,13 @@ bool CPDF_Parser::LoadCrossRefV5(FX_FILESIZE* pos, bool bMainXRef) {
std::unique_ptr<CPDF_Dictionary> pNewTrailer = ToDictionary(pDict->Clone());
if (bMainXRef) {
- m_TrailerData->SetMainTrailer(std::move(pNewTrailer));
- ShrinkObjectMap(size);
- for (auto& it : m_ObjectInfo)
- it.second.type = ObjectType::kFree;
+ m_CrossRefTable =
+ pdfium::MakeUnique<CPDF_CrossRefTable>(std::move(pNewTrailer));
+ m_CrossRefTable->ShrinkObjectMap(size);
} else {
- m_TrailerData->AppendTrailer(std::move(pNewTrailer));
+ m_CrossRefTable = CPDF_CrossRefTable::MergeUp(
+ pdfium::MakeUnique<CPDF_CrossRefTable>(std::move(pNewTrailer)),
+ std::move(m_CrossRefTable));
}
std::vector<std::pair<int32_t, int32_t>> arrIndex;
@@ -1054,7 +981,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_ObjectInfo.empty() ? 0 : GetLastObjNum() + 1;
+ uint32_t dwV5Size =
+ m_CrossRefTable->objects_info().empty() ? 0 : GetLastObjNum() + 1;
if (!dwMaxObjNum.IsValid() || dwMaxObjNum.ValueOrDie() > dwV5Size)
continue;
@@ -1070,30 +998,27 @@ bool CPDF_Parser::LoadCrossRefV5(FX_FILESIZE* pos, bool bMainXRef) {
if (GetObjectType(startnum + j) == ObjectType::kNull) {
FX_FILESIZE offset =
GetVarInt(entrystart + WidthArray[0], WidthArray[1]);
- m_ObjectInfo[startnum + j].pos = offset;
+ m_CrossRefTable->AddNormal(startnum + j, 0, offset);
continue;
}
if (GetObjectType(startnum + j) != ObjectType::kFree)
continue;
- ObjectInfo& info = m_ObjectInfo[startnum + j];
-
- info.type = type;
if (type == ObjectType::kFree) {
- info.pos = 0;
+ m_CrossRefTable->SetFree(startnum + j);
} else {
const FX_FILESIZE entry_value =
GetVarInt(entrystart + WidthArray[0], WidthArray[1]);
if (type == ObjectType::kNotCompressed) {
const auto object_offset = entry_value;
- info.pos = object_offset;
+ m_CrossRefTable->AddNormal(startnum + j, 0, object_offset);
} else {
const auto archive_obj_num = entry_value;
- info.archive_obj_num = archive_obj_num;
if (archive_obj_num < 0 || !IsValidObjectNumber(archive_obj_num))
return false;
- m_ObjectInfo[archive_obj_num].type = ObjectType::kNull;
+
+ m_CrossRefTable->AddCompressed(startnum + j, archive_obj_num);
}
}
}
@@ -1113,19 +1038,29 @@ CPDF_Dictionary* CPDF_Parser::GetRoot() const {
}
const CPDF_Dictionary* CPDF_Parser::GetTrailer() const {
- return m_TrailerData->GetMainTrailer();
+ return m_CrossRefTable->trailer();
}
std::unique_ptr<CPDF_Dictionary> CPDF_Parser::GetCombinedTrailer() const {
- return m_TrailerData->GetCombinedTrailer();
+ return m_CrossRefTable->trailer()
+ ? ToDictionary(m_CrossRefTable->trailer()->Clone())
+ : std::unique_ptr<CPDF_Dictionary>();
}
uint32_t CPDF_Parser::GetInfoObjNum() const {
- return m_TrailerData->GetInfoObjNum();
+ const CPDF_Reference* pRef =
+ ToReference(m_CrossRefTable->trailer()
+ ? m_CrossRefTable->trailer()->GetObjectFor("Info")
+ : nullptr);
+ return pRef ? pRef->GetRefObjNum() : CPDF_Object::kInvalidObjNum;
}
uint32_t CPDF_Parser::GetRootObjNum() const {
- return m_TrailerData->GetRootObjNum();
+ const CPDF_Reference* pRef =
+ ToReference(m_CrossRefTable->trailer()
+ ? m_CrossRefTable->trailer()->GetObjectFor("Root")
+ : nullptr);
+ return pRef ? pRef->GetRefObjNum() : CPDF_Object::kInvalidObjNum;
}
std::unique_ptr<CPDF_Object> CPDF_Parser::ParseIndirectObject(
@@ -1139,7 +1074,7 @@ std::unique_ptr<CPDF_Object> CPDF_Parser::ParseIndirectObject(
pdfium::ScopedSetInsertion<uint32_t> local_insert(&m_ParsingObjNums, objnum);
if (GetObjectType(objnum) == ObjectType::kNotCompressed) {
- FX_FILESIZE pos = m_ObjectInfo[objnum].pos;
+ FX_FILESIZE pos = GetObjectPositionOrZero(objnum);
if (pos <= 0)
return nullptr;
return ParseIndirectObjectAt(pos, objnum);
@@ -1148,7 +1083,7 @@ std::unique_ptr<CPDF_Object> CPDF_Parser::ParseIndirectObject(
return nullptr;
const CPDF_ObjectStream* pObjStream =
- GetObjectStream(m_ObjectInfo[objnum].pos);
+ GetObjectStream(m_CrossRefTable->GetObjectInfo(objnum)->archive_obj_num);
if (!pObjStream)
return nullptr;
@@ -1167,7 +1102,11 @@ const CPDF_ObjectStream* CPDF_Parser::GetObjectStream(uint32_t object_number) {
if (it != m_ObjectStreamMap.end())
return it->second.get();
- const FX_FILESIZE object_pos = GetObjectPositionOrZero(object_number);
+ const auto* info = m_CrossRefTable->GetObjectInfo(object_number);
+ if (!info || info->type != ObjectType::kObjStream)
+ return nullptr;
+
+ const FX_FILESIZE object_pos = info->pos;
if (object_pos <= 0)
return nullptr;
@@ -1273,7 +1212,7 @@ CPDF_Parser::Error CPDF_Parser::StartLinearizedParse(
if (!trailer)
return SUCCESS;
- m_TrailerData->SetMainTrailer(std::move(trailer));
+ m_CrossRefTable->SetTrailer(std::move(trailer));
int32_t xrefsize = GetDirectInteger(GetTrailer(), "Size");
if (xrefsize > 0)
ShrinkObjectMap(xrefsize);
diff --git a/core/fpdfapi/parser/cpdf_parser.h b/core/fpdfapi/parser/cpdf_parser.h
index e9b2a760ea..fc4e49910d 100644
--- a/core/fpdfapi/parser/cpdf_parser.h
+++ b/core/fpdfapi/parser/cpdf_parser.h
@@ -93,8 +93,6 @@ class CPDF_Parser {
RetainPtr<IFX_SeekableReadStream> GetFileAccess() const;
bool IsObjectFree(uint32_t objnum) const;
- FX_FILESIZE GetObjectOffset(uint32_t objnum) const;
-
int GetFileVersion() const { return m_FileVersion; }
bool IsXRefStream() const { return m_bXRefStream; }
@@ -107,6 +105,10 @@ class CPDF_Parser {
return m_pLinearized.get();
}
+ const CPDF_CrossRefTable* GetCrossRefTable() const {
+ return m_CrossRefTable.get();
+ }
+
void SetLinearizedHeader(std::unique_ptr<CPDF_LinearizedHeader> pLinearized);
protected:
@@ -114,7 +116,6 @@ class CPDF_Parser {
using ObjectInfo = CPDF_CrossRefTable::ObjectInfo;
std::unique_ptr<CPDF_SyntaxParser> m_pSyntax;
- std::map<uint32_t, ObjectInfo> m_ObjectInfo;
bool LoadCrossRefV4(FX_FILESIZE pos, bool bSkip);
bool RebuildCrossRef();
@@ -122,8 +123,6 @@ class CPDF_Parser {
private:
friend class CPDF_DataAvail;
- class TrailerData;
-
enum class ParserState {
kDefault,
kComment,
@@ -187,9 +186,9 @@ class CPDF_Parser {
bool m_bHasParsed;
bool m_bXRefStream;
int m_FileVersion;
- // m_TrailerData must be destroyed after m_pSecurityHandler due to the
+ // m_CrossRefTable must be destroyed after m_pSecurityHandler due to the
// ownership of the ID array data.
- std::unique_ptr<TrailerData> m_TrailerData;
+ std::unique_ptr<CPDF_CrossRefTable> m_CrossRefTable;
std::unique_ptr<CPDF_Dictionary> m_pEncryptDict;
FX_FILESIZE m_LastXRefOffset;
std::unique_ptr<CPDF_SecurityHandler> m_pSecurityHandler;
diff --git a/core/fpdfapi/parser/cpdf_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_parser_unittest.cpp
index 555c35c7cb..db48493c2f 100644
--- a/core/fpdfapi/parser/cpdf_parser_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_parser_unittest.cpp
@@ -14,6 +14,16 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/utils/path_service.h"
+namespace {
+
+CPDF_CrossRefTable::ObjectInfo GetObjInfo(const CPDF_Parser& parser,
+ uint32_t obj_num) {
+ const auto* info = parser.GetCrossRefTable()->GetObjectInfo(obj_num);
+ return info ? *info : CPDF_CrossRefTable::ObjectInfo();
+}
+
+} // namespace
+
// A wrapper class to help test member functions of CPDF_Parser.
class CPDF_TestParser : public CPDF_Parser {
public:
@@ -61,9 +71,9 @@ TEST(cpdf_parser, RebuildCrossRefCorrectly) {
const FX_FILESIZE offsets[] = {0, 15, 61, 154, 296, 374, 450};
const uint16_t versions[] = {0, 0, 2, 4, 6, 8, 0};
for (size_t i = 0; i < FX_ArraySize(offsets); ++i)
- EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos);
+ EXPECT_EQ(offsets[i], GetObjInfo(parser, i).pos);
for (size_t i = 0; i < FX_ArraySize(versions); ++i)
- EXPECT_EQ(versions[i], parser.m_ObjectInfo[i].gennum);
+ EXPECT_EQ(versions[i], GetObjInfo(parser, i).gennum);
}
TEST(cpdf_parser, RebuildCrossRefFailed) {
@@ -102,8 +112,8 @@ TEST(cpdf_parser, LoadCrossRefV4) {
CPDF_TestParser::ObjectType::kNotCompressed,
CPDF_TestParser::ObjectType::kNotCompressed};
for (size_t i = 0; i < FX_ArraySize(offsets); ++i) {
- EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos);
- EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type);
+ EXPECT_EQ(offsets[i], GetObjInfo(parser, i).pos);
+ EXPECT_EQ(types[i], GetObjInfo(parser, i).type);
}
}
{
@@ -141,8 +151,8 @@ TEST(cpdf_parser, LoadCrossRefV4) {
CPDF_TestParser::ObjectType::kFree,
CPDF_TestParser::ObjectType::kNotCompressed};
for (size_t i = 0; i < FX_ArraySize(offsets); ++i) {
- EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos);
- EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type);
+ EXPECT_EQ(offsets[i], GetObjInfo(parser, i).pos);
+ EXPECT_EQ(types[i], GetObjInfo(parser, i).type);
}
}
{
@@ -180,8 +190,8 @@ TEST(cpdf_parser, LoadCrossRefV4) {
CPDF_TestParser::ObjectType::kFree,
CPDF_TestParser::ObjectType::kNotCompressed};
for (size_t i = 0; i < FX_ArraySize(offsets); ++i) {
- EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos);
- EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type);
+ EXPECT_EQ(offsets[i], GetObjInfo(parser, i).pos);
+ EXPECT_EQ(types[i], GetObjInfo(parser, i).type);
}
}
{
@@ -211,8 +221,8 @@ TEST(cpdf_parser, LoadCrossRefV4) {
CPDF_TestParser::ObjectType::kNotCompressed,
CPDF_TestParser::ObjectType::kNotCompressed};
for (size_t i = 0; i < FX_ArraySize(offsets); ++i) {
- EXPECT_EQ(offsets[i], parser.m_ObjectInfo[i].pos);
- EXPECT_EQ(types[i], parser.m_ObjectInfo[i].type);
+ EXPECT_EQ(offsets[i], GetObjInfo(parser, i).pos);
+ EXPECT_EQ(types[i], GetObjInfo(parser, i).type);
}
}
}