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

Commit 2acf1a9e 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 am: ffb87501 am: f2131eb3 am: da750ecc am: 2e88fb1b am: 546cc40a am: f777cb29 am: 5a6520b0 am: 6a79afc4
am: 39674b2f

Change-Id: Idbd912e4c7fdbf0bc45fccbdfd540ee53db29805
parents 2631bad1 39674b2f

media/extractors/mp4/MPEG4Extractor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -4754,6 +4754,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;

        }

    }
@@ -5046,6 +5048,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;

        }

    }