commit 959d31794fca9091ff066d6e90457e66d1e5d4a6
author Marco Nelissen <marcone@google.com> Thu May 07 17:02:38 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 07 17:02:38 2015 +0000
tree bc16fddac04b1bdf14128355a1d0012aec2a2daf
parent d7446564c3e469aea1bba5460ff1fb9441f9fc09
parent 07d4f27b150bdba4107d54d71a70e94a3900e95c

am 07d4f27b: am f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrun

* commit '07d4f27b150bdba4107d54d71a70e94a3900e95c':
  Fix potential buffer overrun

media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp

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 @@
         } else {
             numFrames = vorbis_dsp_pcmout(
                     mState, (int16_t *)outHeader->pBuffer,
-                    kMaxNumSamplesPerBuffer);
+                    (kMaxNumSamplesPerBuffer / mVi->channels));
 
             if (numFrames < 0) {
                 ALOGE("vorbis_dsp_pcmout returned %d", numFrames);