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

Commit 025a89dc authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Avoid null pointer dereference am: 688cec6e am: 156450dd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17924106



Change-Id: I72dd5fd6469d1c3c02a00a863c7fb8dc455e71a7
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f2d815b2 156450dd

media/libmediaplayerservice/StagefrightMetadataRetriever.cpp

+4 −2
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ sp<IMemory> StagefrightMetadataRetriever::getImageInternal( 
    sp<AMessage> format = new AMessage;

    status_t err = convertMetaDataToMessage(trackMeta, &format);

    if (err != OK) {

        format = NULL;

        ALOGE("getImageInternal: convertMetaDataToMessage() failed, unable to extract image");

        return NULL;

    }



    uint32_t bitDepth = 8;
@@ -400,7 +401,8 @@ sp<IMemory> StagefrightMetadataRetriever::getFrameInternal( 
    sp<AMessage> format = new AMessage;

    status_t err = convertMetaDataToMessage(trackMeta, &format);

    if (err != OK) {

        format = NULL;

        ALOGE("getFrameInternal: convertMetaDataToMessage() failed, unable to extract frame");

        return NULL;

    }



    Vector<AString> matchingCodecs;