summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn1
-rw-r--r--core/fxge/dib/fx_dib_engine.cpp4
-rw-r--r--core/fxge/dib/fx_dib_engine_unittest.cpp30
-rw-r--r--pdfium.gyp1
4 files changed, 34 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 8d9dd8167e..a4a3e8dd65 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1572,6 +1572,7 @@ test("pdfium_unittests") {
"core/fxcrt/fx_bidi_unittest.cpp",
"core/fxcrt/fx_extension_unittest.cpp",
"core/fxcrt/fx_system_unittest.cpp",
+ "core/fxge/dib/fx_dib_engine_unittest.cpp",
"fpdfsdk/fpdfdoc_unittest.cpp",
"fpdfsdk/fpdfeditimg_unittest.cpp",
]
diff --git a/core/fxge/dib/fx_dib_engine.cpp b/core/fxge/dib/fx_dib_engine.cpp
index 520148fc77..88b0d4b271 100644
--- a/core/fxge/dib/fx_dib_engine.cpp
+++ b/core/fxge/dib/fx_dib_engine.cpp
@@ -306,8 +306,8 @@ CStretchEngine::CStretchEngine(IFX_ScanlineComposer* pDestBitmap,
FX_BOOL bInterpol =
flags & FXDIB_INTERPOL || flags & FXDIB_BICUBIC_INTERPOL;
if (!bInterpol && FXSYS_abs(dest_width) != 0 &&
- FXSYS_abs(dest_height) <
- m_SrcWidth * m_SrcHeight * 8 / FXSYS_abs(dest_width)) {
+ FXSYS_abs(dest_height) / 8 < static_cast<long long>(m_SrcWidth) *
+ m_SrcHeight / FXSYS_abs(dest_width)) {
flags = FXDIB_INTERPOL;
}
m_Flags = flags;
diff --git a/core/fxge/dib/fx_dib_engine_unittest.cpp b/core/fxge/dib/fx_dib_engine_unittest.cpp
new file mode 100644
index 0000000000..d185adf49d
--- /dev/null
+++ b/core/fxge/dib/fx_dib_engine_unittest.cpp
@@ -0,0 +1,30 @@
+// 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 <memory>
+
+#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
+#include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
+#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
+#include "core/fpdfapi/fpdf_render/render_int.h"
+#include "core/fxcrt/include/fx_memory.h"
+#include "core/fxge/dib/dib_int.h"
+#include "core/fxge/include/fx_dib.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+TEST(CStretchEngine, OverflowInCtor) {
+ FX_RECT clip_rect;
+ std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> dict_obj(
+ new CPDF_Dictionary);
+ dict_obj->SetAt("Width", new CPDF_Number(71000));
+ dict_obj->SetAt("Height", new CPDF_Number(12500));
+ std::unique_ptr<CPDF_Stream, ReleaseDeleter<CPDF_Stream>> stream(
+ new CPDF_Stream(nullptr, 0, dict_obj.release()));
+ CPDF_DIBSource dib_source;
+ dib_source.Load(nullptr, stream.get(), nullptr, nullptr, nullptr, nullptr,
+ false, 0, false);
+ CStretchEngine engine(nullptr, FXDIB_8bppRgb, 500, 500, clip_rect,
+ &dib_source, 0);
+ EXPECT_EQ(FXDIB_INTERPOL, engine.m_Flags);
+}
diff --git a/pdfium.gyp b/pdfium.gyp
index 1cc8758bd9..f04ce42d4f 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -949,6 +949,7 @@
'core/fxcrt/fx_bidi_unittest.cpp',
'core/fxcrt/fx_extension_unittest.cpp',
'core/fxcrt/fx_system_unittest.cpp',
+ 'core/fxge/dib/fx_dib_engine_unittest.cpp',
'fpdfsdk/fpdfdoc_unittest.cpp',
'fpdfsdk/fpdfeditimg_unittest.cpp',
'testing/fx_string_testhelpers.h',