Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Natalie Silvanovich
2015-02-19 00:02:30 +00:00
committed by Android (Google) Code Review
parent 755c5d8806 b296e4e0c2
commit 494d5b7757
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android/graphics/Graphics.cpp
View File

@@ -610,7 +610,12 @@ jbyteArray GraphicsJNI::allocateJavaPixelRef(JNIEnv* env, SkBitmap* bitmap,
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);