summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-01-23 15:05:43 -0800
committerTom Sepez <tsepez@chromium.org>2015-01-23 15:05:43 -0800
commite0bbe4aac90e56950f28e322c3d6192c35af5ea0 (patch)
tree55cc9af3afa38333b13a55810d85cd788e6196f8 /fpdfsdk/src
parentaf9be4fe77e1067f1cc265de8aae547f6358bc44 (diff)
downloadpdfium-e0bbe4aac90e56950f28e322c3d6192c35af5ea0.tar.xz
Fix null crash in CheckTrailer.
We are making checks in the incorrect order. Also adds two test cases, one for the this crash, and another for the original issue that motivated the patch. Original Patch by Bo at https://codereview.chromium.org/866003003/ BUG=450871 R=bo_xu@foxitsoftware.com Review URL: https://codereview.chromium.org/872563002
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/fpdf_dataavail_unittest.cpp23
1 files changed, 23 insertions, 0 deletions
diff --git a/fpdfsdk/src/fpdf_dataavail_unittest.cpp b/fpdfsdk/src/fpdf_dataavail_unittest.cpp
new file mode 100644
index 0000000000..6081fa52ac
--- /dev/null
+++ b/fpdfsdk/src/fpdf_dataavail_unittest.cpp
@@ -0,0 +1,23 @@
+// Copyright 2015 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "../../testing/embedder_test.h"
+#include "../../fpdfsdk/include/fpdfview.h"
+#include "../../fpdfsdk/include/fpdfdoc.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class FPDFDataAvailEmbeddertest : public EmbedderTest {
+};
+
+TEST_F(FPDFDataAvailEmbeddertest, TrailerUnterminated) {
+ // Document must open without crashing but is too malformed to be available.
+ EXPECT_TRUE(OpenDocument("testing/resources/trailer_unterminated.pdf"));
+ EXPECT_FALSE(FPDFAvail_IsDocAvail(avail_, &hints_));
+}
+
+TEST_F(FPDFDataAvailEmbeddertest, TrailerAsHexstring) {
+ // Document must open without crashing but is too malformed to be available.
+ EXPECT_TRUE(OpenDocument("testing/resources/trailer_as_hexstring.pdf"));
+ EXPECT_FALSE(FPDFAvail_IsDocAvail(avail_, &hints_));
+}