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

Commit 2a6d6e50 authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Fixes for Region_writeToParcel. 

Check the return value of Parcel::writeInplace. If it is NULL, there
was a failure, so do not attempt to write to it. Instead, report the
error and return false.

If SkRegion::writeToMemory claims to have written a different amount of
memory than it claimed it needed, report that error as well.

Change uses of NULL in this function to nullptr.

BUG:21271229
BUG:20666821
Change-Id: Ia6160f74f30bf42f5ff97f716dadb01d1f0d6961
parent 641234c1

core/jni/android/graphics/Region.cpp

+12 −3
Original line number Diff line number Diff line
@@ -231,15 +231,24 @@ static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel) 
static jboolean Region_writeToParcel(JNIEnv* env, jobject clazz, jlong regionHandle, jobject parcel)

{

    const SkRegion* region = reinterpret_cast<SkRegion*>(regionHandle);

    if (parcel == NULL) {

    if (parcel == nullptr) {

        return JNI_FALSE;

    }



    android::Parcel* p = android::parcelForJavaObject(env, parcel);



    size_t size = region->writeToMemory(NULL);

    const size_t size = region->writeToMemory(nullptr);

    p->writeInt32(size);

    region->writeToMemory(p->writeInplace(size));

    void* dst = p->writeInplace(size);

    if (dst == nullptr) {

        ALOGE("Region.writeToParcel could not write %zi bytes", size);

        return JNI_FALSE;

    }

    const size_t sizeWritten = region->writeToMemory(dst);

    if (sizeWritten != size) {

        ALOGE("SkRegion::writeToMemory should have written %zi bytes but wrote %zi",

                size, sizeWritten);

    }



    return JNI_TRUE;

}