commit 47da6c0b7e4b1e159f106d66f68448c30cd7c2c6
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 15 23:44:25 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 15 23:44:25 2017 +0000
tree dac2f5deae99a74c4c39077ba2073fc21f051067
parent e42038e5c7286a15a50dd1decfa1a579dbda8cd6
parent 33508aff52b5131344cac20a5077419920ea046c

Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev

* changes:
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb am: 12840141a9
  [automerger] Check buffer size in useBuffer in software components am: 4e79910fdb
  Check buffer size in useBuffer in software components

media/libstagefright/foundation/base64.cpp

diff --git a/media/libstagefright/foundation/base64.cpp b/media/libstagefright/foundation/base64.cpp
index 9581986..31fae4e 100644
--- a/media/libstagefright/foundation/base64.cpp
+++ b/media/libstagefright/foundation/base64.cpp
@@ -74,8 +74,7 @@
         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; }