diff options
author | Wonsik Kim <wonsik@google.com> | 2015-09-03 09:46:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 09:46:28 +0000 |
commit | d77786c699c3f846b57b8a8ea00f20749f550960 (patch) | |
tree | bf772f1267f878e703e591cbd6544812693e4067 /media | |
parent | 0ea9e2761a04c4f592d854dbde2749395735fe56 (diff) | |
parent | a6c650a9e7927c7d640828cea66fc96e0bf762ce (diff) | |
download | frameworks_av-d77786c699c3f846b57b8a8ea00f20749f550960.zip frameworks_av-d77786c699c3f846b57b8a8ea00f20749f550960.tar.gz frameworks_av-d77786c699c3f846b57b8a8ea00f20749f550960.tar.bz2 |
am a6c650a9: am 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit 'a6c650a9e7927c7d640828cea66fc96e0bf762ce':
Ogg: avoid size_t overflow in base64 decoding
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/OggExtractor.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp index b37c6b4..130f5a5 100644 --- a/media/libstagefright/OggExtractor.cpp +++ b/media/libstagefright/OggExtractor.cpp @@ -848,11 +848,14 @@ static uint8_t *DecodeBase64(const char *s, size_t size, size_t *outSize) { } } - size_t outLen = 3 * size / 4 - padding; - - *outSize = outLen; + // We divide first to avoid overflow. It's OK to do this because we + // already made sure that size % 4 == 0. + size_t outLen = (size / 4) * 3 - padding; void *buffer = malloc(outLen); + if (buffer == NULL) { + return NULL; + } uint8_t *out = (uint8_t *)buffer; size_t j = 0; @@ -871,10 +874,10 @@ static uint8_t *DecodeBase64(const char *s, size_t size, size_t *outSize) { } else if (c == '/') { value = 63; } else if (c != '=') { - return NULL; + break; } else { if (i < n - padding) { - return NULL; + break; } value = 0; @@ -892,6 +895,13 @@ static uint8_t *DecodeBase64(const char *s, size_t size, size_t *outSize) { } } + // Check if we exited the loop early. + if (j < outLen) { + free(buffer); + return NULL; + } + + *outSize = outLen; return (uint8_t *)buffer; } |