commit 3bb5fdc7e607febaad3bd41ed7a36b596b7286af
author Leon Scroggins III <scroggo@google.com> Tue Feb 10 22:03:43 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 10 22:03:44 2015 +0000
tree 1f2b3affed25194941b30db95c98cf5d4f67952c
parent 696b68c4fc65b671a00cfa82e6bc29a7d665828e
parent 89a2466a2a2859df5f29350117efd7f9d6a2e32f

Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev

core/jni/android/graphics/Graphics.cpp

diff --git a/core/jni/android/graphics/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp
index a51af40..3ea9b58 100644
--- a/core/jni/android/graphics/Graphics.cpp
+++ b/core/jni/android/graphics/Graphics.cpp
@@ -536,7 +536,12 @@
         return NULL;
     }
 
-    const size_t size = bitmap->getSize();
+    const int64_t size64 = bitmap->computeSize64();
+    if (!sk_64_isS32(size64)) {
+        doThrowIAE(env, "bitmap size exceeds 32 bits");
+        return NULL;
+    }
+    const size_t size = sk_64_asS32(size64);
     jbyteArray arrayObj = (jbyteArray) env->CallObjectMethod(gVMRuntime,
                                                              gVMRuntime_newNonMovableArray,
                                                              gByte_class, size);