summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-05-07 16:18:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-07 16:18:25 +0000
commit3fdb2cbb16e7c347d8013cb85b5d29f106c50cf9 (patch)
tree3178be2444483161b11b96776e1be30c32d5c563 /media
parentd8e41553b96432c4d4dae80fcc042b95fd9d27d9 (diff)
parentd638e73568fa43eb964a305ed438603ae5900264 (diff)
downloadframeworks_av-3fdb2cbb16e7c347d8013cb85b5d29f106c50cf9.zip
frameworks_av-3fdb2cbb16e7c347d8013cb85b5d29f106c50cf9.tar.gz
frameworks_av-3fdb2cbb16e7c347d8013cb85b5d29f106c50cf9.tar.bz2
am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrun
* commit 'd638e73568fa43eb964a305ed438603ae5900264': Fix potential buffer overrun
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
index 8f356b6..c559682 100644
--- a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
+++ b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
@@ -364,7 +364,7 @@ void SoftVorbis::onQueueFilled(OMX_U32 portIndex) {
} else {
numFrames = vorbis_dsp_pcmout(
mState, (int16_t *)outHeader->pBuffer,
- kMaxNumSamplesPerBuffer);
+ (kMaxNumSamplesPerBuffer / mVi->channels));
if (numFrames < 0) {
ALOGE("vorbis_dsp_pcmout returned %d", numFrames);