summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-05-07 15:33:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-07 15:33:19 +0000
commit0d9eb04fa1d7d2b524587fa3372381a30067fc15 (patch)
tree71bd9c9550a8b2318ffe2467222de4485601d3c6
parent59cea2616269f34b1f3d046995efd8da42cd5549 (diff)
parent5a75b4215821d633af18dd8dae2495299c070bf0 (diff)
downloadframeworks_av-0d9eb04fa1d7d2b524587fa3372381a30067fc15.zip
frameworks_av-0d9eb04fa1d7d2b524587fa3372381a30067fc15.tar.gz
frameworks_av-0d9eb04fa1d7d2b524587fa3372381a30067fc15.tar.bz2
am 5a75b421: am 30d77e2c: Fix potential buffer overrun
* commit '5a75b4215821d633af18dd8dae2495299c070bf0': 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 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);