[automerger] stagefright: avoid buffer overflow in base64 decoder am:...

[automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f am: 4d76a4b5

Change-Id: Ifd01cbe03ab9bea87ccbc6fa8ff1c119cfca57d8

parents 0a782680 4d76a4b5

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; }