Merge to M46: Enforce input and output dimensionalities for CPDF_StitchFunc.chromium/2490

Also cleans up some places in the relevant functions since we're here.

BUG=551460
R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1421783004 .

(cherry picked from commit 4f85605cbc652a17bc833f883186e0a68af6006d)

Review URL: https://codereview.chromium.org/1432833002 .

1 files changed, 20 insertions, 0 deletions

diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp
new file mode 100644
index 0000000000..af04b4aebb
--- /dev/null
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp
@@ -0,0 +1,20 @@
+// 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 "testing/gtest/include/gtest/gtest.h"
+
+class FPDFPageFuncEmbeddertest : public EmbedderTest {};
+
+TEST_F(FPDFPageFuncEmbeddertest, Bug_551460) {
+  // Should not crash under ASan.
+  // Tests that the number of inputs is not simply calculated from the domain
+  // and trusted. The number of inputs has to be 1.
+  EXPECT_TRUE(OpenDocument("testing/resources/bug_551460.pdf"));
+  FPDF_PAGE page = LoadPage(0);
+  EXPECT_NE(nullptr, page);
+  FPDF_BITMAP bitmap = RenderPage(page);
+  FPDFBitmap_Destroy(bitmap);
+  UnloadPage(page);
+}