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

Commit 494d5b77 authored by Natalie Silvanovich's avatar Natalie Silvanovich Committed by Android (Google) Code Review
Browse files

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

parents 755c5d88 b296e4e0
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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);