patch #1255805 by Frederic Devernay - fix to buffer overflow in dsp.c

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7301 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 11 insertions, 3 deletions

diff --git a/apps/playback.c b/apps/playback.c
index 526fff376b..fb8232012e 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -196,12 +196,20 @@ bool codec_pcmbuf_insert_split_callback(void *ch1, void *ch2,
             yield();
         }
 
+        /* Get the real input_size for output_size bytes, guarding
+         * against resampling buffer overflows. */
         input_size = dsp_input_size(output_size);
-        /* Guard against rounding errors (output_size can be too large). */
-        input_size = MIN(input_size, length);
-
+        if (input_size > length) {
+            DEBUGF("Error: dsp_input_size(%ld=dsp_output_size(%ld))=%ld > %ld\n",
+                   output_size, length, input_size, length);
+            input_size = length;
+        }
+        
         if (input_size <= 0) {
             pcmbuf_flush_buffer(0);
+            DEBUGF("Warning: dsp_input_size(%ld=dsp_output_size(%ld))=%ld <= 0\n",
+                   output_size, length, input_size);
+            /* should we really continue, or should we break? */
             continue;
         }