commit 4ad4ae907fa83773f671137b0e4e8c9525ab81cd
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 30 14:24:37 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 30 14:24:37 2013 +0000
tree a3b424ce1bfe5f345ca68ff2f22c285866b6e36f
parent a306d93cd73c3fc1d81479cbba98638f1e055385

Revert of https://codereview.chromium.org/113823003/
Reason for revert: need to update callsites in linux codecs

R=robertphillips@google.com
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12841 2bbb7eff-a529-9590-31e7-b0007b416f81

src/images/SkImageDecoder_libwebp.cpp

diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp
index 05925d0..4a59510 100644
--- a/src/images/SkImageDecoder_libwebp.cpp
+++ b/src/images/SkImageDecoder_libwebp.cpp
@@ -80,12 +80,13 @@
 
     // sanity check for image size that's about to be decoded.
     {
-        int64_t size = sk_64_mul(*width, *height);
-        if (!sk_64_isS32(size)) {
+        Sk64 size;
+        size.setMul(*width, *height);
+        if (size.isNeg() || !size.is32()) {
             return false;
         }
         // now check that if we are 4-bytes per pixel, we also don't overflow
-        if (sk_64_asS32(size) > (0x7FFFFFFF >> 2)) {
+        if (size.get32() > (0x7FFFFFFF >> 2)) {
             return false;
         }
     }