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

Commit 8d692386 authored by Chad Brubaker's avatar Chad Brubaker Committed by Android Git Automerger
Browse files

am 0351b0e2: Merge "Fix benign unsigned integer overflow" 

* commit '0351b0e2':
  Fix benign unsigned integer overflow
parents 3af0af10 0351b0e2

media/libstagefright/DataURISource.cpp

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ sp<DataURISource> DataURISource::Create(const char *uri) { 
        AString encoded(commaPos + 1);



        // Strip CR and LF...

        for (size_t i = encoded.size(); i-- > 0;) {

        for (size_t i = encoded.size(); i > 0;) {

            i--;

            if (encoded.c_str()[i] == '\r' || encoded.c_str()[i] == '\n') {

                encoded.erase(i, 1);

            }

media/libstagefright/OMXCodec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2840,7 +2840,8 @@ status_t OMXCodec::freeBuffersOnPort( 


    status_t stickyErr = OK;



    for (size_t i = buffers->size(); i-- > 0;) {

    for (size_t i = buffers->size(); i > 0;) {

        i--;

        BufferInfo *info = &buffers->editItemAt(i);



        if (onlyThoseWeOwn && info->mStatus == OWNED_BY_COMPONENT) {