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

Commit 0351b0e2 authored by Chad Brubaker's avatar Chad Brubaker Committed by Gerrit Code Review
Browse files

Merge "Fix benign unsigned integer overflow"

parents e117ee90 622ff28c

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) {