commit 3f4431e97376b8a315ad8862724e1e1fb34c9292
author Marco Nelissen <marcone@google.com> Thu May 07 17:16:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 07 17:16:58 2015 +0000
tree ba14a5648fda108c17b6299f7d4d72efde56397f
parent 49822fe2aa38cab4a8cdf2221480181ae7a5f9d0
parent 959d31794fca9091ff066d6e90457e66d1e5d4a6

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

* commit '959d31794fca9091ff066d6e90457e66d1e5d4a6':
  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);