diff options
| author | weili <weili@chromium.org> | 2016-08-02 11:34:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-02 11:34:08 -0700 |
| commit | 6faf9f9508b858e27fde9a7f75ff6962048326ca (patch) | |
| tree | ee9df182faf94b833a551a303923c5f005a87da5 | |
| parent | 02e6f5957a56ea492961aef71b3c16cf42ea5998 (diff) | |
| download | pdfium-6faf9f9508b858e27fde9a7f75ff6962048326ca.tar.xz | |
Fix Jbig2 document context creation by checking proper pointer
The pointer a unique_ptr contains should be checked instead of the
pointer of the unique_ptr itself.
BUG=chromium:631912
Review-Url: https://codereview.chromium.org/2205573004
| -rw-r--r-- | BUILD.gn | 1 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_embeddertest.cpp | 19 | ||||
| -rw-r--r-- | core/fxcodec/codec/fx_codec_jbig.cpp | 2 | ||||
| -rw-r--r-- | pdfium.gyp | 1 | ||||
| -rw-r--r-- | testing/resources/bug_631912.pdf | bin | 0 -> 1248 bytes |
5 files changed, 22 insertions, 1 deletions
@@ -1598,6 +1598,7 @@ test("pdfium_embeddertests") { "core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp", "core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp", "core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp", + "core/fxcodec/codec/fx_codec_embeddertest.cpp", "core/fxge/ge/fx_ge_text_embeddertest.cpp", "fpdfsdk/fpdf_dataavail_embeddertest.cpp", "fpdfsdk/fpdfdoc_embeddertest.cpp", diff --git a/core/fxcodec/codec/fx_codec_embeddertest.cpp b/core/fxcodec/codec/fx_codec_embeddertest.cpp new file mode 100644 index 0000000000..441494c0e6 --- /dev/null +++ b/core/fxcodec/codec/fx_codec_embeddertest.cpp @@ -0,0 +1,19 @@ +// Copyright 2016 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 "testing/gtest/include/gtest/gtest.h" + +class FXCodecEmbeddertest : public EmbedderTest {}; + +TEST_F(FXCodecEmbeddertest, Bug_631912) { + // Test jbig2 image in PDF file can be loaded successfully. + // Should not crash. + EXPECT_TRUE(OpenDocument("bug_631912.pdf")); + FPDF_PAGE page = LoadPage(0); + EXPECT_NE(nullptr, page); + FPDF_BITMAP bitmap = RenderPage(page); + FPDFBitmap_Destroy(bitmap); + UnloadPage(page); +} diff --git a/core/fxcodec/codec/fx_codec_jbig.cpp b/core/fxcodec/codec/fx_codec_jbig.cpp index adc57fd1ad..7713ca3ecb 100644 --- a/core/fxcodec/codec/fx_codec_jbig.cpp +++ b/core/fxcodec/codec/fx_codec_jbig.cpp @@ -20,7 +20,7 @@ JBig2_DocumentContext::~JBig2_DocumentContext() {} JBig2_DocumentContext* GetJBig2DocumentContext( std::unique_ptr<JBig2_DocumentContext>* pContextHolder) { - if (!pContextHolder) + if (!pContextHolder->get()) pContextHolder->reset(new JBig2_DocumentContext()); return pContextHolder->get(); } diff --git a/pdfium.gyp b/pdfium.gyp index d0d23b97d7..f83ec3a7a2 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -976,6 +976,7 @@ 'core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp', 'core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp', 'core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp', + 'core/fxcodec/codec/fx_codec_embeddertest.cpp', 'core/fxge/ge/fx_ge_text_embeddertest.cpp', 'fpdfsdk/fpdf_dataavail_embeddertest.cpp', 'fpdfsdk/fpdfdoc_embeddertest.cpp', diff --git a/testing/resources/bug_631912.pdf b/testing/resources/bug_631912.pdf Binary files differnew file mode 100644 index 0000000000..cd68ea0a86 --- /dev/null +++ b/testing/resources/bug_631912.pdf |