Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89a2466a authored by Leon Scroggins III's avatar Leon Scroggins III Committed by Leon Scroggins
Browse files

Check that bitmap's size does not exceed 32 bits. DO NOT MERGE

BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
parent 61333d1b
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -536,7 +536,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);