summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/fpdfapi/parser/cpdf_data_avail.cpp20
-rw-r--r--core/fpdfapi/parser/cpdf_parser.cpp108
-rw-r--r--core/fpdfapi/parser/cpdf_syntax_parser.h5
-rw-r--r--core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp34
4 files changed, 84 insertions, 83 deletions
diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp
index 3195821279..709874ef15 100644
--- a/core/fpdfapi/parser/cpdf_data_avail.cpp
+++ b/core/fpdfapi/parser/cpdf_data_avail.cpp
@@ -661,8 +661,8 @@ std::unique_ptr<CPDF_Object> CPDF_DataAvail::ParseIndirectObjectAt(
FX_FILESIZE pos,
uint32_t objnum,
CPDF_IndirectObjectHolder* pObjList) {
- FX_FILESIZE SavedPos = m_syntaxParser.SavePos();
- m_syntaxParser.RestorePos(pos);
+ FX_FILESIZE SavedPos = m_syntaxParser.GetPos();
+ m_syntaxParser.SetPos(pos);
bool bIsNumber;
CFX_ByteString word = m_syntaxParser.GetNextWord(&bIsNumber);
@@ -679,13 +679,13 @@ std::unique_ptr<CPDF_Object> CPDF_DataAvail::ParseIndirectObjectAt(
uint32_t gennum = FXSYS_atoui(word.c_str());
if (m_syntaxParser.GetKeyword() != "obj") {
- m_syntaxParser.RestorePos(SavedPos);
+ m_syntaxParser.SetPos(SavedPos);
return nullptr;
}
std::unique_ptr<CPDF_Object> pObj =
m_syntaxParser.GetObject(pObjList, parser_objnum, gennum, true);
- m_syntaxParser.RestorePos(SavedPos);
+ m_syntaxParser.SetPos(SavedPos);
return pObj;
}
@@ -727,7 +727,7 @@ bool CPDF_DataAvail::IsLinearizedFile(uint8_t* pData, uint32_t dwLen) {
m_dwHeaderOffset = offset;
m_syntaxParser.InitParser(file, offset);
- m_syntaxParser.RestorePos(m_syntaxParser.m_HeaderOffset + 9);
+ m_syntaxParser.SetPos(m_syntaxParser.m_HeaderOffset + 9);
bool bNumber;
CFX_ByteString wordObjNum = m_syntaxParser.GetNextWord(&bNumber);
@@ -760,7 +760,7 @@ bool CPDF_DataAvail::CheckEnd(DownloadHints* pHints) {
auto file = pdfium::MakeRetain<CFX_MemoryStream>(
buffer, static_cast<size_t>(dwSize), false);
m_syntaxParser.InitParser(file, 0);
- m_syntaxParser.RestorePos(dwSize - 1);
+ m_syntaxParser.SetPos(dwSize - 1);
if (!m_syntaxParser.SearchWord("startxref", true, false, dwSize)) {
m_docStatus = PDF_DATAAVAIL_LOADALLFILE;
@@ -819,14 +819,14 @@ int32_t CPDF_DataAvail::CheckCrossRefStream(DownloadHints* pHints,
m_parser.ParseIndirectObjectAt(nullptr, 0, objNum);
if (!pObj) {
- m_Pos += m_parser.m_pSyntax->SavePos();
+ m_Pos += m_parser.m_pSyntax->GetPos();
return 0;
}
CPDF_Dictionary* pDict = pObj->GetDict();
CPDF_Name* pName = ToName(pDict ? pDict->GetObjectFor("Type") : nullptr);
if (pName && pName->GetString() == "XRef") {
- m_Pos += m_parser.m_pSyntax->SavePos();
+ m_Pos += m_parser.m_pSyntax->GetPos();
xref_offset = pObj->GetDict()->GetIntegerFor("Prev");
return 1;
}
@@ -1012,7 +1012,7 @@ bool CPDF_DataAvail::CheckCrossRef(DownloadHints* pHints) {
bool CPDF_DataAvail::CheckTrailerAppend(DownloadHints* pHints) {
if (m_Pos < m_dwFileLen) {
- FX_FILESIZE dwAppendPos = m_Pos + m_syntaxParser.SavePos();
+ FX_FILESIZE dwAppendPos = m_Pos + m_syntaxParser.GetPos();
int32_t iSize = (int32_t)(
dwAppendPos + 512 > m_dwFileLen ? m_dwFileLen - dwAppendPos : 512);
@@ -1057,7 +1057,7 @@ bool CPDF_DataAvail::CheckTrailer(DownloadHints* pHints) {
std::unique_ptr<CPDF_Object> pTrailer(
m_syntaxParser.GetObject(nullptr, 0, 0, true));
if (!pTrailer) {
- m_Pos += m_syntaxParser.SavePos();
+ m_Pos += m_syntaxParser.GetPos();
pHints->AddSegment(m_Pos, iTrailerSize);
return false;
}
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp
index 86428ab9d7..fc98be5f6e 100644
--- a/core/fpdfapi/parser/cpdf_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_parser.cpp
@@ -155,12 +155,12 @@ CPDF_Parser::Error CPDF_Parser::StartParse(
if (m_pSyntax->m_FileLen < m_pSyntax->m_HeaderOffset + 9)
return FORMAT_ERROR;
- m_pSyntax->RestorePos(m_pSyntax->m_FileLen - m_pSyntax->m_HeaderOffset - 9);
+ m_pSyntax->SetPos(m_pSyntax->m_FileLen - m_pSyntax->m_HeaderOffset - 9);
m_pDocument = pDocument;
bool bXRefRebuilt = false;
if (m_pSyntax->SearchWord("startxref", true, false, 4096)) {
- m_SortedOffset.insert(m_pSyntax->SavePos());
+ m_SortedOffset.insert(m_pSyntax->GetPos());
m_pSyntax->GetKeyword();
bool bNumber;
@@ -286,11 +286,11 @@ bool CPDF_Parser::VerifyCrossRefV4() {
if (it.second.pos == 0)
continue;
// Find the first non-zero position.
- FX_FILESIZE SavedPos = m_pSyntax->SavePos();
- m_pSyntax->RestorePos(it.second.pos);
+ FX_FILESIZE SavedPos = m_pSyntax->GetPos();
+ m_pSyntax->SetPos(it.second.pos);
bool is_num = false;
CFX_ByteString num_str = m_pSyntax->GetNextWord(&is_num);
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
if (!is_num || num_str.IsEmpty() ||
FXSYS_atoui(num_str.c_str()) != it.first) {
// If the object number read doesn't match the one stored,
@@ -414,12 +414,12 @@ bool CPDF_Parser::LoadLinearizedCrossRefV4(FX_FILESIZE pos,
uint32_t dwObjCount) {
FX_FILESIZE dwStartPos = pos - m_pSyntax->m_HeaderOffset;
- m_pSyntax->RestorePos(dwStartPos);
+ m_pSyntax->SetPos(dwStartPos);
m_SortedOffset.insert(pos);
uint32_t start_objnum = 0;
uint32_t count = dwObjCount;
- FX_FILESIZE SavedPos = m_pSyntax->SavePos();
+ FX_FILESIZE SavedPos = m_pSyntax->GetPos();
const int32_t recordsize = 20;
std::vector<char> buf(1024 * recordsize + 1);
@@ -465,14 +465,14 @@ bool CPDF_Parser::LoadLinearizedCrossRefV4(FX_FILESIZE pos,
}
}
}
- m_pSyntax->RestorePos(SavedPos + count * recordsize);
+ m_pSyntax->SetPos(SavedPos + count * recordsize);
return true;
}
bool CPDF_Parser::LoadCrossRefV4(FX_FILESIZE pos,
FX_FILESIZE streampos,
bool bSkip) {
- m_pSyntax->RestorePos(pos);
+ m_pSyntax->SetPos(pos);
if (m_pSyntax->GetKeyword() != "xref")
return false;
@@ -481,14 +481,14 @@ bool CPDF_Parser::LoadCrossRefV4(FX_FILESIZE pos,
m_SortedOffset.insert(streampos);
while (1) {
- FX_FILESIZE SavedPos = m_pSyntax->SavePos();
+ FX_FILESIZE SavedPos = m_pSyntax->GetPos();
bool bIsNumber;
CFX_ByteString word = m_pSyntax->GetNextWord(&bIsNumber);
if (word.IsEmpty())
return false;
if (!bIsNumber) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
break;
}
@@ -498,7 +498,7 @@ bool CPDF_Parser::LoadCrossRefV4(FX_FILESIZE pos,
uint32_t count = m_pSyntax->GetDirectNum();
m_pSyntax->ToNextWord();
- SavedPos = m_pSyntax->SavePos();
+ SavedPos = m_pSyntax->GetPos();
const int32_t recordsize = 20;
m_dwXrefStartObjNum = start_objnum;
@@ -541,7 +541,7 @@ bool CPDF_Parser::LoadCrossRefV4(FX_FILESIZE pos,
}
}
}
- m_pSyntax->RestorePos(SavedPos + count * recordsize);
+ m_pSyntax->SetPos(SavedPos + count * recordsize);
}
return !streampos || LoadCrossRefV5(&streampos, false);
}
@@ -736,7 +736,7 @@ bool CPDF_Parser::RebuildCrossRef() {
}
FX_FILESIZE offset = 0;
- m_pSyntax->RestorePos(obj_pos);
+ m_pSyntax->SetPos(obj_pos);
offset = m_pSyntax->FindTag("obj", 0);
if (offset == -1)
offset = 0;
@@ -776,7 +776,7 @@ bool CPDF_Parser::RebuildCrossRef() {
if (inside_index == 7) {
if (PDFCharIsWhitespace(byte) || PDFCharIsDelimiter(byte)) {
last_trailer = pos + i - 7;
- m_pSyntax->RestorePos(pos + i - m_pSyntax->m_HeaderOffset);
+ m_pSyntax->SetPos(pos + i - m_pSyntax->m_HeaderOffset);
std::unique_ptr<CPDF_Object> pObj =
m_pSyntax->GetObject(m_pDocument, 0, 0, true);
@@ -813,7 +813,7 @@ bool CPDF_Parser::RebuildCrossRef() {
m_pTrailer = ToDictionary(std::move(pObj));
}
- FX_FILESIZE dwSavePos = m_pSyntax->SavePos();
+ FX_FILESIZE dwSavePos = m_pSyntax->GetPos();
CFX_ByteString strWord = m_pSyntax->GetKeyword();
if (!strWord.Compare("startxref")) {
bool bNumber;
@@ -822,7 +822,7 @@ bool CPDF_Parser::RebuildCrossRef() {
if (bNumber)
m_LastXRefOffset = FXSYS_atoi(bsOffset.c_str());
}
- m_pSyntax->RestorePos(dwSavePos);
+ m_pSyntax->SetPos(dwSavePos);
}
}
}
@@ -1135,7 +1135,7 @@ std::unique_ptr<CPDF_Object> CPDF_Parser::ParseIndirectObject(
if (it == m_ObjCache[pObjStream].end())
return nullptr;
- syntax.RestorePos(offset + it->second);
+ syntax.SetPos(offset + it->second);
return syntax.GetObject(pObjList, 0, 0, true);
}
@@ -1229,43 +1229,43 @@ void CPDF_Parser::GetIndirectBinary(uint32_t objnum,
if (pos == 0)
return;
- FX_FILESIZE SavedPos = m_pSyntax->SavePos();
- m_pSyntax->RestorePos(pos);
+ FX_FILESIZE SavedPos = m_pSyntax->GetPos();
+ m_pSyntax->SetPos(pos);
bool bIsNumber;
CFX_ByteString word = m_pSyntax->GetNextWord(&bIsNumber);
if (!bIsNumber) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return;
}
uint32_t parser_objnum = FXSYS_atoui(word.c_str());
if (parser_objnum && parser_objnum != objnum) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return;
}
word = m_pSyntax->GetNextWord(&bIsNumber);
if (!bIsNumber) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return;
}
if (m_pSyntax->GetKeyword() != "obj") {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return;
}
auto it = m_SortedOffset.find(pos);
if (it == m_SortedOffset.end() || ++it == m_SortedOffset.end()) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return;
}
FX_FILESIZE nextoff = *it;
bool bNextOffValid = false;
if (nextoff != pos) {
- m_pSyntax->RestorePos(nextoff);
+ m_pSyntax->SetPos(nextoff);
word = m_pSyntax->GetNextWord(&bIsNumber);
if (word == "xref") {
bNextOffValid = true;
@@ -1278,66 +1278,66 @@ void CPDF_Parser::GetIndirectBinary(uint32_t objnum,
}
if (!bNextOffValid) {
- m_pSyntax->RestorePos(pos);
+ m_pSyntax->SetPos(pos);
while (1) {
if (m_pSyntax->GetKeyword() == "endobj")
break;
- if (m_pSyntax->SavePos() == m_pSyntax->m_FileLen)
+ if (m_pSyntax->GetPos() == m_pSyntax->m_FileLen)
break;
}
- nextoff = m_pSyntax->SavePos();
+ nextoff = m_pSyntax->GetPos();
}
size = (uint32_t)(nextoff - pos);
pBuffer = FX_Alloc(uint8_t, size);
- m_pSyntax->RestorePos(pos);
+ m_pSyntax->SetPos(pos);
m_pSyntax->ReadBlock(pBuffer, size);
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
}
std::unique_ptr<CPDF_Object> CPDF_Parser::ParseIndirectObjectAt(
CPDF_IndirectObjectHolder* pObjList,
FX_FILESIZE pos,
uint32_t objnum) {
- FX_FILESIZE SavedPos = m_pSyntax->SavePos();
- m_pSyntax->RestorePos(pos);
+ FX_FILESIZE SavedPos = m_pSyntax->GetPos();
+ m_pSyntax->SetPos(pos);
bool bIsNumber;
CFX_ByteString word = m_pSyntax->GetNextWord(&bIsNumber);
if (!bIsNumber) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return nullptr;
}
- FX_FILESIZE objOffset = m_pSyntax->SavePos();
+ FX_FILESIZE objOffset = m_pSyntax->GetPos();
objOffset -= word.GetLength();
uint32_t parser_objnum = FXSYS_atoui(word.c_str());
if (objnum && parser_objnum != objnum) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return nullptr;
}
word = m_pSyntax->GetNextWord(&bIsNumber);
if (!bIsNumber) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return nullptr;
}
uint32_t parser_gennum = FXSYS_atoui(word.c_str());
if (m_pSyntax->GetKeyword() != "obj") {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return nullptr;
}
std::unique_ptr<CPDF_Object> pObj =
m_pSyntax->GetObject(pObjList, objnum, parser_gennum, true);
- m_pSyntax->SavePos();
+ m_pSyntax->GetPos();
CFX_ByteString bsWord = m_pSyntax->GetKeyword();
if (bsWord == "endobj")
- m_pSyntax->SavePos();
+ m_pSyntax->GetPos();
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
if (pObj) {
if (!objnum)
pObj->m_ObjNum = parser_objnum;
@@ -1351,31 +1351,31 @@ std::unique_ptr<CPDF_Object> CPDF_Parser::ParseIndirectObjectAtByStrict(
FX_FILESIZE pos,
uint32_t objnum,
FX_FILESIZE* pResultPos) {
- FX_FILESIZE SavedPos = m_pSyntax->SavePos();
- m_pSyntax->RestorePos(pos);
+ FX_FILESIZE SavedPos = m_pSyntax->GetPos();
+ m_pSyntax->SetPos(pos);
bool bIsNumber;
CFX_ByteString word = m_pSyntax->GetNextWord(&bIsNumber);
if (!bIsNumber) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return nullptr;
}
uint32_t parser_objnum = FXSYS_atoui(word.c_str());
if (objnum && parser_objnum != objnum) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return nullptr;
}
word = m_pSyntax->GetNextWord(&bIsNumber);
if (!bIsNumber) {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return nullptr;
}
uint32_t gennum = FXSYS_atoui(word.c_str());
if (m_pSyntax->GetKeyword() != "obj") {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return nullptr;
}
@@ -1385,7 +1385,7 @@ std::unique_ptr<CPDF_Object> CPDF_Parser::ParseIndirectObjectAtByStrict(
if (pResultPos)
*pResultPos = m_pSyntax->m_Pos;
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return pObj;
}
@@ -1417,9 +1417,9 @@ bool CPDF_Parser::IsLinearizedFile(
const CFX_RetainPtr<IFX_SeekableReadStream>& pFileAccess,
uint32_t offset) {
m_pSyntax->InitParser(pFileAccess, offset);
- m_pSyntax->RestorePos(m_pSyntax->m_HeaderOffset + 9);
+ m_pSyntax->SetPos(m_pSyntax->m_HeaderOffset + 9);
- FX_FILESIZE SavedPos = m_pSyntax->SavePos();
+ FX_FILESIZE SavedPos = m_pSyntax->GetPos();
bool bIsNumber;
CFX_ByteString word = m_pSyntax->GetNextWord(&bIsNumber);
if (!bIsNumber)
@@ -1432,7 +1432,7 @@ bool CPDF_Parser::IsLinearizedFile(
uint32_t gennum = FXSYS_atoui(word.c_str());
if (m_pSyntax->GetKeyword() != "obj") {
- m_pSyntax->RestorePos(SavedPos);
+ m_pSyntax->SetPos(SavedPos);
return false;
}
@@ -1465,7 +1465,7 @@ CPDF_Parser::Error CPDF_Parser::StartLinearizedParse(
m_bHasParsed = true;
m_pDocument = pDocument;
- FX_FILESIZE dwFirstXRefOffset = m_pSyntax->SavePos();
+ FX_FILESIZE dwFirstXRefOffset = m_pSyntax->GetPos();
bool bXRefRebuilt = false;
bool bLoadV4 = LoadCrossRefV4(dwFirstXRefOffset, 0, false);
if (!bLoadV4 && !LoadCrossRefV5(&dwFirstXRefOffset, true)) {
@@ -1549,7 +1549,7 @@ CPDF_Parser::Error CPDF_Parser::LoadLinearizedMainXRefTable() {
uint32_t dwSaveMetadataObjnum = m_pSyntax->m_MetadataObjnum;
m_pSyntax->m_MetadataObjnum = 0;
m_pTrailer.reset();
- m_pSyntax->RestorePos(m_LastXRefOffset - m_pSyntax->m_HeaderOffset);
+ m_pSyntax->SetPos(m_LastXRefOffset - m_pSyntax->m_HeaderOffset);
uint8_t ch = 0;
uint32_t dwCount = 0;
@@ -1557,7 +1557,7 @@ CPDF_Parser::Error CPDF_Parser::LoadLinearizedMainXRefTable() {
while (PDFCharIsWhitespace(ch)) {
++dwCount;
if (m_pSyntax->m_FileLen <=
- (FX_FILESIZE)(m_pSyntax->SavePos() + m_pSyntax->m_HeaderOffset)) {
+ (FX_FILESIZE)(m_pSyntax->GetPos() + m_pSyntax->m_HeaderOffset)) {
break;
}
m_pSyntax->GetNextChar(ch);
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.h b/core/fpdfapi/parser/cpdf_syntax_parser.h
index 9c2d84070d..f9a9bd9a8a 100644
--- a/core/fpdfapi/parser/cpdf_syntax_parser.h
+++ b/core/fpdfapi/parser/cpdf_syntax_parser.h
@@ -7,6 +7,7 @@
#ifndef CORE_FPDFAPI_PARSER_CPDF_SYNTAX_PARSER_H_
#define CORE_FPDFAPI_PARSER_CPDF_SYNTAX_PARSER_H_
+#include <algorithm>
#include <memory>
#include "core/fxcrt/cfx_string_pool_template.h"
@@ -29,8 +30,8 @@ class CPDF_SyntaxParser {
void InitParser(const CFX_RetainPtr<IFX_SeekableReadStream>& pFileAccess,
uint32_t HeaderOffset);
- FX_FILESIZE SavePos() const { return m_Pos; }
- void RestorePos(FX_FILESIZE pos) { m_Pos = pos; }
+ FX_FILESIZE GetPos() const { return m_Pos; }
+ void SetPos(FX_FILESIZE pos) { m_Pos = std::min(pos, m_FileLen); }
std::unique_ptr<CPDF_Object> GetObject(CPDF_IndirectObjectHolder* pObjList,
uint32_t objnum,
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp
index 249276f29a..ac7a875af6 100644
--- a/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp
@@ -21,7 +21,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 0, false), 0);
EXPECT_EQ("", parser.ReadHexString());
- EXPECT_EQ(0, parser.SavePos());
+ EXPECT_EQ(0, parser.GetPos());
}
{
@@ -30,7 +30,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 2, false), 0);
EXPECT_EQ("", parser.ReadHexString());
- EXPECT_EQ(2, parser.SavePos());
+ EXPECT_EQ(2, parser.GetPos());
}
{
@@ -39,7 +39,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false), 0);
EXPECT_EQ("\x12\xb0", parser.ReadHexString());
- EXPECT_EQ(4, parser.SavePos());
+ EXPECT_EQ(4, parser.GetPos());
}
{
@@ -48,7 +48,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 10, false), 0);
EXPECT_EQ("\x10", parser.ReadHexString());
- EXPECT_EQ(10, parser.SavePos());
+ EXPECT_EQ(10, parser.GetPos());
}
{
@@ -57,7 +57,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false), 0);
EXPECT_EQ("\xab", parser.ReadHexString());
- EXPECT_EQ(4, parser.SavePos());
+ EXPECT_EQ(4, parser.GetPos());
}
{
@@ -66,7 +66,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false), 0);
EXPECT_EQ("\xab", parser.ReadHexString());
- EXPECT_EQ(4, parser.SavePos());
+ EXPECT_EQ(4, parser.GetPos());
}
{
@@ -75,7 +75,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 9, false), 0);
EXPECT_EQ("\x1a\x2b", parser.ReadHexString());
- EXPECT_EQ(5, parser.SavePos());
+ EXPECT_EQ(5, parser.GetPos());
}
{
@@ -83,20 +83,20 @@ TEST(cpdf_syntax_parser, ReadHexString) {
uint8_t data[] = "12ab>";
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 5, false), 0);
- parser.RestorePos(5);
+ parser.SetPos(5);
EXPECT_EQ("", parser.ReadHexString());
- parser.RestorePos(6);
+ parser.SetPos(6);
EXPECT_EQ("", parser.ReadHexString());
- parser.RestorePos(-1);
+ parser.SetPos(-1);
EXPECT_EQ("", parser.ReadHexString());
- parser.RestorePos(std::numeric_limits<FX_FILESIZE>::max());
+ parser.SetPos(std::numeric_limits<FX_FILESIZE>::max());
EXPECT_EQ("", parser.ReadHexString());
// Check string still parses when set to 0.
- parser.RestorePos(0);
+ parser.SetPos(0);
EXPECT_EQ("\x12\xab", parser.ReadHexString());
}
@@ -106,7 +106,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 4, false), 0);
EXPECT_EQ("\x1a\x2b", parser.ReadHexString());
- EXPECT_EQ(4, parser.SavePos());
+ EXPECT_EQ(4, parser.GetPos());
}
{
@@ -115,7 +115,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 5, false), 0);
EXPECT_EQ("\x12\xab", parser.ReadHexString());
- EXPECT_EQ(5, parser.SavePos());
+ EXPECT_EQ(5, parser.GetPos());
}
{
@@ -124,7 +124,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 8, false), 0);
EXPECT_EQ("\x1a\x20", parser.ReadHexString());
- EXPECT_EQ(4, parser.SavePos());
+ EXPECT_EQ(4, parser.GetPos());
}
{
@@ -133,7 +133,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 8, false), 0);
EXPECT_EQ("\x1a\x2a\xdf", parser.ReadHexString());
- EXPECT_EQ(8, parser.SavePos());
+ EXPECT_EQ(8, parser.GetPos());
}
{
@@ -142,7 +142,7 @@ TEST(cpdf_syntax_parser, ReadHexString) {
CPDF_SyntaxParser parser;
parser.InitParser(pdfium::MakeRetain<CFX_MemoryStream>(data, 1, false), 0);
EXPECT_EQ("", parser.ReadHexString());
- EXPECT_EQ(1, parser.SavePos());
+ EXPECT_EQ(1, parser.GetPos());
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:43:57 +0000