From 88798cff29934b58e0a8d81e94005472d612b964 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 14 Aug 2018 18:26:36 +0000 Subject: Remove CFX_BufferSeekableReadStream. Replace it with CFX_ReadOnlyMemoryStream, which does the same thing. Take some checks from CFX_BufferSeekableReadStream and add them CFX_ReadOnlyMemoryStream. Change-Id: I25554c3aec3ec96967f8df16ca68a64dba121b6f Reviewed-on: https://pdfium-review.googlesource.com/40070 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- .../parser/cpdf_cross_ref_avail_unittest.cpp | 4 +-- core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp | 4 +-- core/fpdfapi/parser/cpdf_parser_unittest.cpp | 5 ++-- .../parser/cpdf_read_validator_unittest.cpp | 9 +++--- .../fpdfapi/parser/cpdf_syntax_parser_unittest.cpp | 33 +++++++++++----------- core/fxcrt/cfx_readonlymemorystream.cpp | 2 +- core/fxcrt/xml/cfx_xmlinstruction_unittest.cpp | 6 ++-- core/fxcrt/xml/cfx_xmlparser_unittest.cpp | 6 ++-- 8 files changed, 34 insertions(+), 35 deletions(-) (limited to 'core') diff --git a/core/fpdfapi/parser/cpdf_cross_ref_avail_unittest.cpp b/core/fpdfapi/parser/cpdf_cross_ref_avail_unittest.cpp index eab7330cf6..6cdc3f1817 100644 --- a/core/fpdfapi/parser/cpdf_cross_ref_avail_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_cross_ref_avail_unittest.cpp @@ -8,7 +8,7 @@ #include #include "core/fpdfapi/parser/cpdf_syntax_parser.h" -#include "testing/fx_string_testhelpers.h" +#include "core/fxcrt/cfx_readonlymemorystream.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/base/ptr_util.h" @@ -17,7 +17,7 @@ namespace { std::unique_ptr MakeParserForBuffer( pdfium::span buffer) { return pdfium::MakeUnique( - pdfium::MakeRetain(buffer)); + pdfium::MakeRetain(buffer)); } } // namespace diff --git a/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp b/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp index 97ba434768..c372d74a00 100644 --- a/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp @@ -16,8 +16,8 @@ #include "core/fpdfapi/parser/cpdf_read_validator.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_syntax_parser.h" +#include "core/fxcrt/cfx_readonlymemorystream.h" #include "core/fxcrt/fx_stream.h" -#include "testing/fx_string_testhelpers.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/utils/path_service.h" @@ -48,7 +48,7 @@ class TestLinearizedHeader : public CPDF_LinearizedHeader { static std::unique_ptr MakeHeader( const std::string& inline_data) { - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::as_bytes(pdfium::make_span(inline_data)))); std::unique_ptr dict = ToDictionary(parser.GetObjectBody(nullptr)); diff --git a/core/fpdfapi/parser/cpdf_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_parser_unittest.cpp index d5166fbdf0..00f3770e87 100644 --- a/core/fpdfapi/parser/cpdf_parser_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_parser_unittest.cpp @@ -11,10 +11,10 @@ #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fpdfapi/parser/cpdf_parser.h" #include "core/fpdfapi/parser/cpdf_syntax_parser.h" +#include "core/fxcrt/cfx_readonlymemorystream.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_stream.h" #include "core/fxcrt/retain_ptr.h" -#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/utils/path_service.h" @@ -50,8 +50,7 @@ class CPDF_TestParser : public CPDF_Parser { bool InitTestFromBufferWithOffset(pdfium::span buffer, FX_FILESIZE header_offset) { m_pSyntax = CPDF_SyntaxParser::CreateForTesting( - pdfium::MakeRetain(buffer), - header_offset); + pdfium::MakeRetain(buffer), header_offset); return true; } diff --git a/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp b/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp index ccfb451dd8..640269884d 100644 --- a/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_read_validator_unittest.cpp @@ -8,6 +8,7 @@ #include #include +#include "core/fxcrt/cfx_readonlymemorystream.h" #include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" @@ -65,7 +66,7 @@ class MockDownloadHints : public CPDF_DataAvail::DownloadHints { TEST(CPDF_ReadValidatorTest, UnavailableData) { std::vector test_data(kTestDataSize); - auto file = pdfium::MakeRetain(test_data); + auto file = pdfium::MakeRetain(test_data); MockFileAvail file_avail; auto validator = pdfium::MakeRetain(file, &file_avail); @@ -88,7 +89,7 @@ TEST(CPDF_ReadValidatorTest, UnavailableData) { TEST(CPDF_ReadValidatorTest, UnavailableDataWithHints) { std::vector test_data(kTestDataSize); - auto file = pdfium::MakeRetain(test_data); + auto file = pdfium::MakeRetain(test_data); MockFileAvail file_avail; auto validator = pdfium::MakeRetain(file, &file_avail); @@ -143,7 +144,7 @@ TEST(CPDF_ReadValidatorTest, ReadError) { TEST(CPDF_ReadValidatorTest, IntOverflow) { std::vector test_data(kTestDataSize); - auto file = pdfium::MakeRetain(test_data); + auto file = pdfium::MakeRetain(test_data); MockFileAvail file_avail; auto validator = pdfium::MakeRetain(file, &file_avail); @@ -241,7 +242,7 @@ TEST(CPDF_ReadValidatorTest, SessionReset) { TEST(CPDF_ReadValidatorTest, CheckDataRangeAndRequestIfUnavailable) { std::vector test_data(kTestDataSize); - auto file = pdfium::MakeRetain(test_data); + auto file = pdfium::MakeRetain(test_data); MockFileAvail file_avail; auto validator = pdfium::MakeRetain(file, &file_avail); diff --git a/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp index 498eddf12b..5b06d33d4b 100644 --- a/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_syntax_parser_unittest.cpp @@ -8,8 +8,8 @@ #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fpdfapi/parser/cpdf_parser.h" #include "core/fpdfapi/parser/cpdf_syntax_parser.h" +#include "core/fxcrt/cfx_readonlymemorystream.h" #include "core/fxcrt/fx_extension.h" -#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/utils/path_service.h" @@ -17,7 +17,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Empty string. static const uint8_t data[] = ""; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 0))); EXPECT_EQ("", parser.ReadHexString()); EXPECT_EQ(0, parser.GetPos()); @@ -26,7 +26,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Blank string. static const uint8_t data[] = " "; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 2))); EXPECT_EQ("", parser.ReadHexString()); EXPECT_EQ(2, parser.GetPos()); @@ -35,7 +35,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Skips unknown characters. static const uint8_t data[] = "z12b"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 4))); EXPECT_EQ("\x12\xb0", parser.ReadHexString()); EXPECT_EQ(4, parser.GetPos()); @@ -44,7 +44,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Skips unknown characters. static const uint8_t data[] = "*<&*#$^&@1"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 10))); EXPECT_EQ("\x10", parser.ReadHexString()); EXPECT_EQ(10, parser.GetPos()); @@ -53,7 +53,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Skips unknown characters. static const uint8_t data[] = "\x80zab"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 4))); EXPECT_EQ("\xab", parser.ReadHexString()); EXPECT_EQ(4, parser.GetPos()); @@ -62,7 +62,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Skips unknown characters. static const uint8_t data[] = "\xffzab"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 4))); EXPECT_EQ("\xab", parser.ReadHexString()); EXPECT_EQ(4, parser.GetPos()); @@ -71,7 +71,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Regular conversion. static const uint8_t data[] = "1A2b>abcd"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 9))); EXPECT_EQ("\x1a\x2b", parser.ReadHexString()); EXPECT_EQ(5, parser.GetPos()); @@ -80,7 +80,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Position out of bounds. static const uint8_t data[] = "12ab>"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 5))); parser.SetPos(5); EXPECT_EQ("", parser.ReadHexString()); @@ -102,7 +102,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Missing ending >. static const uint8_t data[] = "1A2b"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 4))); EXPECT_EQ("\x1a\x2b", parser.ReadHexString()); EXPECT_EQ(4, parser.GetPos()); @@ -111,7 +111,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Missing ending >. static const uint8_t data[] = "12abz"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 5))); EXPECT_EQ("\x12\xab", parser.ReadHexString()); EXPECT_EQ(5, parser.GetPos()); @@ -120,7 +120,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Uneven number of bytes. static const uint8_t data[] = "1A2>asdf"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 8))); EXPECT_EQ("\x1a\x20", parser.ReadHexString()); EXPECT_EQ(4, parser.GetPos()); @@ -129,7 +129,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Uneven number of bytes. static const uint8_t data[] = "1A2zasdf"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 8))); EXPECT_EQ("\x1a\x2a\xdf", parser.ReadHexString()); EXPECT_EQ(8, parser.GetPos()); @@ -138,7 +138,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { { // Just ending character. static const uint8_t data[] = ">"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 1))); EXPECT_EQ("", parser.ReadHexString()); EXPECT_EQ(1, parser.GetPos()); @@ -148,7 +148,7 @@ TEST(cpdf_syntax_parser, ReadHexString) { TEST(cpdf_syntax_parser, GetInvalidReference) { // Data with a reference with number CPDF_Object::kInvalidObjNum static const uint8_t data[] = "4294967295 0 R"; - CPDF_SyntaxParser parser(pdfium::MakeRetain( + CPDF_SyntaxParser parser(pdfium::MakeRetain( pdfium::make_span(data, 14))); std::unique_ptr ref = parser.GetObjectBody(nullptr); EXPECT_FALSE(ref); @@ -156,8 +156,7 @@ TEST(cpdf_syntax_parser, GetInvalidReference) { TEST(cpdf_syntax_parser, PeekNextWord) { static const uint8_t data[] = " WORD "; - CPDF_SyntaxParser parser( - pdfium::MakeRetain(data)); + CPDF_SyntaxParser parser(pdfium::MakeRetain(data)); EXPECT_EQ("WORD", parser.PeekNextWord(nullptr)); EXPECT_EQ("WORD", parser.GetNextWord(nullptr)); } diff --git a/core/fxcrt/cfx_readonlymemorystream.cpp b/core/fxcrt/cfx_readonlymemorystream.cpp index a01ed2e474..0a1a53a456 100644 --- a/core/fxcrt/cfx_readonlymemorystream.cpp +++ b/core/fxcrt/cfx_readonlymemorystream.cpp @@ -21,7 +21,7 @@ FX_FILESIZE CFX_ReadOnlyMemoryStream::GetSize() { bool CFX_ReadOnlyMemoryStream::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) { - if (offset < 0) + if (!buffer || offset < 0 || size == 0) return false; FX_SAFE_SIZE_T pos = size; diff --git a/core/fxcrt/xml/cfx_xmlinstruction_unittest.cpp b/core/fxcrt/xml/cfx_xmlinstruction_unittest.cpp index 0109ab2985..c1fbad5f0f 100644 --- a/core/fxcrt/xml/cfx_xmlinstruction_unittest.cpp +++ b/core/fxcrt/xml/cfx_xmlinstruction_unittest.cpp @@ -4,10 +4,10 @@ #include "core/fxcrt/xml/cfx_xmlinstruction.h" +#include "core/fxcrt/cfx_readonlymemorystream.h" #include "core/fxcrt/xml/cfx_xmldocument.h" #include "core/fxcrt/xml/cfx_xmlelement.h" #include "core/fxcrt/xml/cfx_xmlparser.h" -#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/string_write_stream.h" #include "testing/test_support.h" @@ -86,7 +86,7 @@ TEST(CFX_XMLInstructionTest, ParseAndReSave) { "\n" ""; - auto in_stream = pdfium::MakeRetain( + auto in_stream = pdfium::MakeRetain( pdfium::as_bytes(pdfium::make_span(input))); CFX_XMLParser parser(in_stream); @@ -119,7 +119,7 @@ TEST(CFX_XMLInstructionTest, ParseAndReSaveInnerInstruction) { "\n" ""; - auto in_stream = pdfium::MakeRetain( + auto in_stream = pdfium::MakeRetain( pdfium::as_bytes(pdfium::make_span(input))); CFX_XMLParser parser(in_stream); diff --git a/core/fxcrt/xml/cfx_xmlparser_unittest.cpp b/core/fxcrt/xml/cfx_xmlparser_unittest.cpp index c1236ce182..86d340ea83 100644 --- a/core/fxcrt/xml/cfx_xmlparser_unittest.cpp +++ b/core/fxcrt/xml/cfx_xmlparser_unittest.cpp @@ -6,11 +6,11 @@ #include +#include "core/fxcrt/cfx_readonlymemorystream.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/xml/cfx_xmldocument.h" #include "core/fxcrt/xml/cfx_xmlelement.h" #include "core/fxcrt/xml/cfx_xmlinstruction.h" -#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" #include "third_party/base/ptr_util.h" @@ -18,8 +18,8 @@ class CFX_XMLParserTest : public testing::Test { public: std::unique_ptr Parse(pdfium::span input) { - CFX_XMLParser parser(pdfium::MakeRetain( - pdfium::as_bytes(input))); + CFX_XMLParser parser( + pdfium::MakeRetain(pdfium::as_bytes(input))); return parser.Parse(); } }; -- cgit v1.2.3