diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-05-09 13:35:01 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-09 13:35:01 +0000 |
| commit | 5f7c5be8b7072d46e8d8088a1ec14370ecfad44c (patch) | |
| tree | e63c47c3d5278ee3b9465b17ed37cd65f77d4e3c | |
| parent | df1298a228abb59eb167d0be43d46a50c0333497 (diff) | |
| download | pdfium-5f7c5be8b7072d46e8d8088a1ec14370ecfad44c.tar.xz | |
Filter out "Type" and "DecodeParms" from trailer keys.
Bug: pdfium:873
Change-Id: I12ae5b8776f5a73c4be81bed53ada05c94d46882
Reviewed-on: https://pdfium-review.googlesource.com/32190
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
| -rw-r--r-- | core/fpdfapi/edit/cpdf_creator.cpp | 3 | ||||
| -rw-r--r-- | core/fpdfapi/edit/cpdf_creator_embeddertest.cpp | 20 |
2 files changed, 22 insertions, 1 deletions
diff --git a/core/fpdfapi/edit/cpdf_creator.cpp b/core/fpdfapi/edit/cpdf_creator.cpp index 0ab5612654..9176c21e45 100644 --- a/core/fpdfapi/edit/cpdf_creator.cpp +++ b/core/fpdfapi/edit/cpdf_creator.cpp @@ -627,7 +627,8 @@ int32_t CPDF_Creator::WriteDoc_Stage4() { CPDF_Object* pValue = it.second.get(); if (key == "Encrypt" || key == "Size" || key == "Filter" || key == "Index" || key == "Length" || key == "Prev" || key == "W" || - key == "XRefStm" || key == "ID") { + key == "XRefStm" || key == "ID" || key == "DecodeParms" || + key == "Type") { continue; } if (!m_Archive->WriteString(("/")) || diff --git a/core/fpdfapi/edit/cpdf_creator_embeddertest.cpp b/core/fpdfapi/edit/cpdf_creator_embeddertest.cpp index 1913c4ba19..f8520c4238 100644 --- a/core/fpdfapi/edit/cpdf_creator_embeddertest.cpp +++ b/core/fpdfapi/edit/cpdf_creator_embeddertest.cpp @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <cstring> #include <memory> #include <string> #include <vector> @@ -12,6 +13,7 @@ #include "public/fpdf_edit.h" #include "public/fpdfview.h" #include "testing/embedder_test.h" +#include "testing/gmock/include/gmock/gmock-matchers.h" #include "testing/gtest/include/gtest/gtest.h" class CPDF_CreatorEmbedderTest : public EmbedderTest {}; @@ -42,3 +44,21 @@ TEST_F(CPDF_CreatorEmbedderTest, SavedDocsAreEqualAfterParse) { // The sizes of saved docs should be equal. EXPECT_EQ(saved_doc_1.size(), saved_doc_2.size()); } + +TEST_F(CPDF_CreatorEmbedderTest, BUG_873) { + EXPECT_TRUE(OpenDocument("embedded_attachments.pdf")); + EXPECT_TRUE(FPDF_SaveAsCopy(document(), this, 0)); + + // Cannot match second part of the ID since it is randomly generated. + std::string saved_data = GetString(); + const char kTrailerBeforeSecondID[] = + "trailer\r\n<</Info 9 0 R /Root 11 0 R /Size " + "36/ID[<D889EB6B9ADF88E5EDA7DC08FE85978B><"; + ASSERT_THAT(saved_data, testing::HasSubstr(kTrailerBeforeSecondID)); + size_t trailer_start = saved_data.find(kTrailerBeforeSecondID); + constexpr size_t kIdLen = 32; + size_t trailer_continuation = + trailer_start + strlen(kTrailerBeforeSecondID) + kIdLen; + std::string data_after_second_id = saved_data.substr(trailer_continuation); + EXPECT_THAT(data_after_second_id, testing::StartsWith(">]>>\r\n")); +} |