Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1234)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp

Issue 1527823003: Fix free entry handling for cross reference v4 reading. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp
index 640feac9aad497af4875e3a95d77d7ae4df68b42..aba639c85028a76c8b759c00547e0461a2b36477 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp
@@ -7,12 +7,65 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/utils/path_service.h"
+// Functions to help test an array's content against expected results.
+template <class TYPE>
+bool CompareArray(const CFX_ArrayTemplate<TYPE>& array1,
+ const TYPE* array2,
+ size_t size) {
+ if (array1.GetSize() != size)
+ return false;
+
+ for (int i = 0; i < size; ++i)
+ if (array1.GetAt(i) != array2[i])
+ return false;
+ return true;
+}
+template bool CompareArray<uint8_t>(const CFX_ByteArray&,
+ const uint8_t*,
+ size_t);
+template bool CompareArray<FX_WORD>(const CFX_WordArray&,
+ const FX_WORD*,
+ size_t);
+template bool CompareArray<FX_DWORD>(const CFX_DWordArray&,
+ const FX_DWORD*,
+ size_t);
+template bool CompareArray<FX_FILESIZE>(const CFX_FileSizeArray&,
+ const FX_FILESIZE*,
+ size_t);
+
+// Provide a way to read test data from a buffer instead of a file.
+class CFX_TestBufferRead : public IFX_FileRead {
+ public:
+ CFX_TestBufferRead(const unsigned char* buffer_in, size_t buf_size)
+ : buffer_(buffer_in), total_size_(buf_size) {}
+
+ // IFX_Stream
+ void Release() override { delete this; }
+
+ // IFX_FileRead
+ virtual FX_BOOL ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) {
+ if (offset < 0 || offset + size > total_size_) {
+ return FALSE;
+ }
+
+ memcpy(buffer, buffer_ + offset, size);
+ return TRUE;
+ }
+ virtual FX_FILESIZE GetSize() { return (FX_FILESIZE)total_size_; };
+
+ protected:
+ const unsigned char* buffer_;
+ size_t total_size_;
+};
+
+// A wrapper class to help test member functions of CPDF_Parser.
class CPDF_TestParser : public CPDF_Parser {
public:
CPDF_TestParser() {}
~CPDF_TestParser() {}
- bool InitTest(const FX_CHAR* path) {
+ // Setup reading from a file and initial states.
+ bool InitTestFromFile(const FX_CHAR* path) {
IFX_FileRead* pFileAccess = FX_CreateFileRead(path);
if (!pFileAccess)
return false;
@@ -22,11 +75,23 @@ class CPDF_TestParser : public CPDF_Parser {
return true;
}
+ // Setup reading from a buffer and initial states.
+ bool InitTestFromBuffer(const unsigned char* buffer, size_t len) {
+ CFX_TestBufferRead* buffer_reader = new CFX_TestBufferRead(buffer, len);
+
+ // For the test file, the header is set at the beginning.
+ m_Syntax.InitParser(buffer_reader, 0);
+ return true;
+ }
+
private:
- // Add test case as private friend so that RebuildCrossRef in CPDF_Parser
- // can be accessed.
+ // Add test cases here as private friend so that protected members in
+ // CPDF_Parser can be accessed by test cases.
+ // Need to access RebuildCrossRef.
FRIEND_TEST(fpdf_parser_parser, RebuildCrossRefCorrectly);
FRIEND_TEST(fpdf_parser_parser, RebuildCrossRefFailed);
+ // Need to access LoadCrossRefV4.
+ FRIEND_TEST(fpdf_parser_parser, LoadCrossRefV4);
};
// TODO(thestig) Using unique_ptr with ReleaseDeleter is still not ideal.
@@ -197,20 +262,14 @@ TEST(fpdf_parser_parser, RebuildCrossRefCorrectly) {
std::string test_file;
ASSERT_TRUE(PathService::GetTestFilePath("parser_rebuildxref_correct.pdf",
&test_file));
- ASSERT_TRUE(parser.InitTest(test_file.c_str())) << test_file;
+ ASSERT_TRUE(parser.InitTestFromFile(test_file.c_str())) << test_file;
ASSERT_TRUE(parser.RebuildCrossRef());
const FX_FILESIZE offsets[] = {0, 15, 61, 154, 296, 374, 450};
const FX_WORD versions[] = {0, 0, 2, 4, 6, 8, 0};
- static_assert(FX_ArraySize(offsets) == FX_ArraySize(versions),
- "numbers of offsets and versions should be same.");
- ASSERT_EQ(FX_ArraySize(offsets), parser.m_CrossRef.GetSize());
- ASSERT_EQ(FX_ArraySize(versions), parser.m_ObjVersion.GetSize());
-
- for (int i = 0; i < FX_ArraySize(offsets); ++i) {
- EXPECT_EQ(offsets[i], parser.m_CrossRef.GetAt(i));
- EXPECT_EQ(versions[i], parser.m_ObjVersion.GetAt(i));
- }
+ ASSERT_TRUE(CompareArray(parser.m_CrossRef, offsets, FX_ArraySize(offsets)));
+ ASSERT_TRUE(
+ CompareArray(parser.m_ObjVersion, versions, FX_ArraySize(versions)));
}
TEST(fpdf_parser_parser, RebuildCrossRefFailed) {
@@ -218,7 +277,105 @@ TEST(fpdf_parser_parser, RebuildCrossRefFailed) {
std::string test_file;
ASSERT_TRUE(PathService::GetTestFilePath(
"parser_rebuildxref_error_notrailer.pdf", &test_file));
- ASSERT_TRUE(parser.InitTest(test_file.c_str())) << test_file;
+ ASSERT_TRUE(parser.InitTestFromFile(test_file.c_str())) << test_file;
ASSERT_FALSE(parser.RebuildCrossRef());
-}
+}
+
+TEST(fpdf_parser_parser, LoadCrossRefV4) {
+ {
+ const unsigned char xref_table[] =
+ "xref \n"
+ "0 6 \n"
+ "0000000003 65535 f \n"
+ "0000000017 00000 n \n"
+ "0000000081 00000 n \n"
+ "0000000000 00007 f \n"
+ "0000000331 00000 n \n"
+ "0000000409 00000 n \n"
+ "trail"; // Needed to end cross ref table reading.
+ CPDF_TestParser parser;
+ ASSERT_TRUE(
+ parser.InitTestFromBuffer(xref_table, FX_ArraySize(xref_table)));
+
+ ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, FALSE));
+ const FX_FILESIZE offsets[] = {0, 17, 81, 0, 331, 409};
+ const uint8_t types[] = {0, 1, 1, 0, 1, 1};
+ ASSERT_TRUE(
+ CompareArray(parser.m_CrossRef, offsets, FX_ArraySize(offsets)));
+ ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types)));
+ }
+ {
+ const unsigned char xref_table[] =
+ "xref \n"
+ "0 1 \n"
+ "0000000000 65535 f \n"
+ "3 1 \n"
+ "0000025325 00000 n \n"
+ "8 2 \n"
+ "0000025518 00002 n \n"
+ "0000025635 00000 n \n"
+ "12 1 \n"
+ "0000025777 00000 n \n"
+ "trail"; // Needed to end cross ref table reading.
+ CPDF_TestParser parser;
+ ASSERT_TRUE(
+ parser.InitTestFromBuffer(xref_table, FX_ArraySize(xref_table)));
+
+ ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, FALSE));
+ const FX_FILESIZE offsets[] = {0, 0, 0, 25325, 0, 0, 0,
+ 0, 25518, 25635, 0, 0, 25777};
+ const uint8_t types[] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1};
+ ASSERT_TRUE(
+ CompareArray(parser.m_CrossRef, offsets, FX_ArraySize(offsets)));
+ ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types)));
+ }
+ {
+ const unsigned char xref_table[] =
+ "xref \n"
+ "0 1 \n"
+ "0000000000 65535 f \n"
+ "3 1 \n"
+ "0000025325 00000 n \n"
+ "8 2 \n"
+ "0000000000 65535 f \n"
+ "0000025635 00000 n \n"
+ "12 1 \n"
+ "0000025777 00000 n \n"
+ "trail"; // Needed to end cross ref table reading.
+ CPDF_TestParser parser;
+ ASSERT_TRUE(
+ parser.InitTestFromBuffer(xref_table, FX_ArraySize(xref_table)));
+
+ ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, FALSE));
+ const FX_FILESIZE offsets[] = {0, 0, 0, 25325, 0, 0, 0,
+ 0, 0, 25635, 0, 0, 25777};
+ const uint8_t types[] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1};
+ ASSERT_TRUE(
+ CompareArray(parser.m_CrossRef, offsets, FX_ArraySize(offsets)));
+ ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types)));
+ }
+ {
+ const unsigned char xref_table[] =
+ "xref \n"
+ "0 7 \n"
+ "0000000002 65535 f \n"
+ "0000000023 00000 n \n"
+ "0000000003 65535 f \n"
+ "0000000004 65535 f \n"
+ "0000000000 65535 f \n"
+ "0000000045 00000 n \n"
+ "0000000179 00000 n \n"
+ "trail"; // Needed to end cross ref table reading.
+ CPDF_TestParser parser;
+ ASSERT_TRUE(
+ parser.InitTestFromBuffer(xref_table, FX_ArraySize(xref_table)));
+
+ ASSERT_TRUE(parser.LoadCrossRefV4(0, 0, FALSE));
+ const FX_FILESIZE offsets[] = {0, 23, 0, 0, 0, 45, 179};
+ const uint8_t types[] = {0, 1, 0, 0, 0, 1, 1};
+ ASSERT_TRUE(
+ CompareArray(parser.m_CrossRef, offsets, FX_ArraySize(offsets)));
+ ASSERT_TRUE(CompareArray(parser.m_V5Type, types, FX_ArraySize(types)));
+ }
+}
« no previous file with comments | « core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698