summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-05-07 15:02:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-07 15:02:30 +0000
commit5a75b4215821d633af18dd8dae2495299c070bf0 (patch)
tree43927ba8ef37d7ba757d78bea1e87b4e32767389
parentb919a3a3d38c4b1cbb378c38cc6154a81ebe01c7 (diff)
parent30d77e2c75c1973f9fb363717af92cf640685da3 (diff)
downloadframeworks_av-5a75b4215821d633af18dd8dae2495299c070bf0.zip
frameworks_av-5a75b4215821d633af18dd8dae2495299c070bf0.tar.gz
frameworks_av-5a75b4215821d633af18dd8dae2495299c070bf0.tar.bz2
am 30d77e2c: Fix potential buffer overrun
* commit '30d77e2c75c1973f9fb363717af92cf640685da3': Fix potential buffer overrun
-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 51bb958..c1c5e64 100644
--- a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
+++ b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
@@ -357,7 +357,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);