diff options
author | Wonsik Kim <wonsik@google.com> | 2015-09-11 06:51:10 +0000 |
---|---|---|
committer | Wonsik Kim <wonsik@google.com> | 2015-09-11 06:51:10 +0000 |
commit | 28314aef9e8a666dbb75bbd555f6566a6c991f1c (patch) | |
tree | 472d338d65970f75ed5df6cddc4664e9e2a42d34 /media/libstagefright/foundation | |
parent | c9ac5dfdafed1c66beae090cafa97002764e0ca3 (diff) | |
download | frameworks_av-28314aef9e8a666dbb75bbd555f6566a6c991f1c.zip frameworks_av-28314aef9e8a666dbb75bbd555f6566a6c991f1c.tar.gz frameworks_av-28314aef9e8a666dbb75bbd555f6566a6c991f1c.tar.bz2 |
Revert "Avoid size_t overflow in base64 decoding once again"
This reverts commit c9ac5dfdafed1c66beae090cafa97002764e0ca3.
Change-Id: Iae9707bbd8641a0bb00fcda39a20eb8b8f4f5232
Diffstat (limited to 'media/libstagefright/foundation')
-rw-r--r-- | media/libstagefright/foundation/base64.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/media/libstagefright/foundation/base64.cpp b/media/libstagefright/foundation/base64.cpp index 7da7db9..dcf5bef 100644 --- a/media/libstagefright/foundation/base64.cpp +++ b/media/libstagefright/foundation/base64.cpp @@ -22,11 +22,11 @@ namespace android { sp<ABuffer> decodeBase64(const AString &s) { - size_t n = s.size(); - if ((n % 4) != 0) { + if ((s.size() % 4) != 0) { return NULL; } + size_t n = s.size(); size_t padding = 0; if (n >= 1 && s.c_str()[n - 1] == '=') { padding = 1; @@ -40,16 +40,11 @@ sp<ABuffer> decodeBase64(const AString &s) { } } - // We divide first to avoid overflow. It's OK to do this because we - // already made sure that n % 4 == 0. - size_t outLen = (n / 4) * 3 - padding; + size_t outLen = 3 * s.size() / 4 - padding; sp<ABuffer> buffer = new ABuffer(outLen); uint8_t *out = buffer->data(); - if (out == NULL || buffer->size() < outLen) { - return NULL; - } size_t j = 0; uint32_t accum = 0; for (size_t i = 0; i < n; ++i) { |