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

Commit 3eb9ee6f authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Fix use-after-free" into oc-dr1-dev 

am: 8626cd18

Change-Id: Ib4666da39710948b86d942136c1fdee4b1b3cfa4
parents b0b67fab 8626cd18

services/core/jni/com_android_server_GraphicsStatsService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ static void addToDump(JNIEnv* env, jobject, jlong dumpPtr, jstring jpath, jstrin 
    std::string path;

    const ProfileData* data = nullptr;

    LOG_ALWAYS_FATAL_IF(jdata == nullptr && jpath == nullptr, "Path and data can't both be null");

    ScopedByteArrayRO buffer{env};

    if (jdata != nullptr) {

        ScopedByteArrayRO buffer(env, jdata);

        buffer.reset(jdata);

        LOG_ALWAYS_FATAL_IF(buffer.size() != sizeof(ProfileData),

                "Buffer size %zu doesn't match expected %zu!", buffer.size(), sizeof(ProfileData));

        data = reinterpret_cast<const ProfileData*>(buffer.get());