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

Commit 59e469e0 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Fix a few potential crashes 

Change-Id: Icb71cb07495406be756e195f2578b6e3aa8b1163
parent 58cfee58

media/libstagefright/NuMediaExtractor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,10 @@ void NuMediaExtractor::updateDurationAndBitrate() { 


    for (size_t i = 0; i < mImpl->countTracks(); ++i) {

        sp<MetaData> meta = mImpl->getTrackMetaData(i);

        if (meta == NULL) {

            ALOGW("no metadata for track %zu", i);

            continue;

        }



        int32_t bitrate;

        if (!meta->findInt32(kKeyBitRate, &bitrate)) {

media/libstagefright/Utils.cpp

+6 −0
Original line number Diff line number Diff line
@@ -89,8 +89,14 @@ static status_t copyNALUToABuffer(sp<ABuffer> *buffer, const uint8_t *ptr, size_ 


status_t convertMetaDataToMessage(

        const sp<MetaData> &meta, sp<AMessage> *format) {



    format->clear();



    if (meta == NULL) {

        ALOGE("convertMetaDataToMessage: NULL input");

        return BAD_VALUE;

    }



    const char *mime;

    CHECK(meta->findCString(kKeyMIMEType, &mime));

media/ndk/NdkMediaFormat.cpp

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ AMediaFormat* AMediaFormat_fromMsg(const void* data) { 
    ALOGV("private ctor");

    AMediaFormat* mData = new AMediaFormat();

    mData->mFormat = *((sp<AMessage>*)data);

    if (mData->mFormat == NULL) {

        ALOGW("got NULL format");

        mData->mFormat = new AMessage;

    }

    return mData;

}