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

Commit ffb87501 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Fix memory leaks" into lmp-dev am: 3e913a79 am: 0ae16eb7 am:... 

Merge "Fix memory leaks" into lmp-dev am: 3e913a79 am: 0ae16eb7 am: cf520f4f am: 22b4aa34 am: a4856a62
am: 64fa39c0

Change-Id: Iae1a0ed14dd7d2b6e37fff0992e7e9e4ed91dce6
parents 25c38b2f 64fa39c0

media/libstagefright/MPEG4Extractor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -4386,6 +4386,8 @@ status_t MPEG4Source::read( 
        }

        if (size > mBuffer->size()) {

            ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());

            mBuffer->release();

            mBuffer = NULL;

            return ERROR_BUFFER_TOO_SMALL;

        }

    }
@@ -4672,6 +4674,8 @@ status_t MPEG4Source::fragmentedRead( 
        }

        if (size > mBuffer->size()) {

            ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());

            mBuffer->release();

            mBuffer = NULL;

            return ERROR_BUFFER_TOO_SMALL;

        }

    }