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

Commit 24125176 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-f-dev 

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f am: 4d76a4b5 am: 5e5bb2a8 am: 61c116ad am: 9064a5c7 am: 25b927e2 am: 0ad7b10c am: 8fbbb6af
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f am: 4d76a4b5 am: 5e5bb2a8 am: 61c116ad am: 9064a5c7 am: 25b927e2 am: 0ad7b10c
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f am: 4d76a4b5 am: 5e5bb2a8 am: 61c116ad am: 9064a5c7 am: 25b927e2
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f am: 4d76a4b5 am: 5e5bb2a8 am: 61c116ad am: 9064a5c7
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f am: 4d76a4b5 am: 5e5bb2a8 am: 61c116ad
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f am: 4d76a4b5 am: 5e5bb2a8
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f am: 4d76a4b5
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a
  stagefright: avoid buffer overflow in base64 decoder
parents 95bdcbe9 92e76580

media/libstagefright/foundation/base64.cpp

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ sp<ABuffer> decodeBase64(const AString &s) { 
        accum = (accum << 6) | value;



        if (((i + 1) % 4) == 0) {

            out[j++] = (accum >> 16);



            if (j < outLen) { out[j++] = (accum >> 16); }

            if (j < outLen) { out[j++] = (accum >> 8) & 0xff; }

            if (j < outLen) { out[j++] = accum & 0xff; }