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

Commit cb593d38 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge "ANetworkSession: avoid overflow in readMore" into nyc-dev am: 2d597d47 

am: 1ab268e7

* commit '1ab268e7':
  ANetworkSession: avoid overflow in readMore

Change-Id: I98bbba4810d11ef52be634e749effeaaad2096e8
parents 37328ac2 1ab268e7

media/libstagefright/foundation/ANetworkSession.cpp

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ status_t ANetworkSession::Session::readMore() { 
        while (mInBuffer.size() >= 2) {

            size_t offset = 2;



            unsigned payloadLen = data[1] & 0x7f;

            uint64_t payloadLen = data[1] & 0x7f;

            if (payloadLen == 126) {

                if (offset + 2 > mInBuffer.size()) {

                    break;
@@ -485,7 +485,7 @@ status_t ANetworkSession::Session::readMore() { 
                offset += 4;

            }



            if (offset + payloadLen > mInBuffer.size()) {

            if (payloadLen > mInBuffer.size() || offset > mInBuffer.size() - payloadLen) {

                break;

            }