From d1d4460547bcd76db7142cf9b6370dc952d459fc Mon Sep 17 00:00:00 2001
From: reed <reed@google.com>
Date: Thu, 1 Oct 2015 11:21:57 -0700
Subject: add hard-coded limit for tmp allocations when HQ image scaling

BUG=528628

Review URL: https://codereview.chromium.org/1368393003
---
 src/core/SkBitmapScaler.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/core/SkBitmapScaler.cpp')

diff --git a/src/core/SkBitmapScaler.cpp b/src/core/SkBitmapScaler.cpp
index 962fdce375..965955a2dc 100644
--- a/src/core/SkBitmapScaler.cpp
+++ b/src/core/SkBitmapScaler.cpp
@@ -245,11 +245,13 @@ bool SkBitmapScaler::Resize(SkBitmap* resultPtr, const SkPixmap& source, ResizeM
       return false;
     }
 
-    BGRAConvolve2D(sourceSubset, static_cast<int>(source.rowBytes()),
-      !source.isOpaque(), filter.xFilter(), filter.yFilter(),
-      static_cast<int>(result.rowBytes()),
-      static_cast<unsigned char*>(result.getPixels()),
-      convolveProcs, true);
+    if (!BGRAConvolve2D(sourceSubset, static_cast<int>(source.rowBytes()),
+                        !source.isOpaque(), filter.xFilter(), filter.yFilter(),
+                        static_cast<int>(result.rowBytes()),
+                        static_cast<unsigned char*>(result.getPixels()),
+                        convolveProcs, true)) {
+        return false;
+    }
 
     *resultPtr = result;
     resultPtr->lockPixels();
-- 
cgit v1.2.3