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

Commit 142514e1 authored by Chuangjie Xia's avatar Chuangjie Xia Committed by Marco Nelissen
Browse files

Fix exception when delete an uninitialized object 

Due to some reason, for example, mediaserver dies, SniffAMR fails and
the variable mMeta is not initialized. Then exception happens when
the flow deletes mMeta in ~AMRExtractor().

Need to check whether mMeta is uninitialized before deleting it.

Bug: 138694976
Test: MTBF test
Change-Id: I398f1d8639a11bf076e51e9d9077a1f2dd89ab52
parent 6f83b317

media/extractors/amr/AMRExtractor.cpp

+4 −1
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ static bool SniffAMR( 


AMRExtractor::AMRExtractor(DataSourceHelper *source)

    : mDataSource(source),

      mMeta(NULL),

      mInitCheck(NO_INIT),

      mOffsetTableLength(0) {

    float confidence;
@@ -191,8 +192,10 @@ AMRExtractor::AMRExtractor(DataSourceHelper *source) 


AMRExtractor::~AMRExtractor() {

    delete mDataSource;

    if (mMeta) {

        AMediaFormat_delete(mMeta);

    }

}



media_status_t AMRExtractor::getMetaData(AMediaFormat *meta) {

    AMediaFormat_clear(meta);