[FFmpeg-soc] [soc]: r2583 - mlp/mlpdec.c

[ramiro]

Author: ramiro
Date: Sat Jun 28 13:37:21 2008
New Revision: 2583

Log:
Check result from get_vlc2().

Modified:
   mlp/mlpdec.c

Modified: mlp/mlpdec.c
==============================================================================
--- mlp/mlpdec.c	(original)
+++ mlp/mlpdec.c	Sat Jun 28 13:37:21 2008
@@ -285,7 +285,8 @@ static inline void calculate_sign_huff(M
  */
 
 static inline int read_huff(MLPDecodeContext *m, GetBitContext *gbp,
-                            unsigned int substr, unsigned int channel)
+                            unsigned int substr, unsigned int channel,
+                            int32_t *sample)
 {
     int codebook = m->codebook[channel];
     int quant_step_size = m->quant_step_size[substr][channel];
@@ -296,12 +297,16 @@ static inline int read_huff(MLPDecodeCon
         result = get_vlc2(gbp, huff_vlc[codebook-1].table,
                           VLC_BITS, (9 + VLC_BITS - 1) / VLC_BITS);
 
+    if (result < 0)
+        return result;
+
     if (lsb_bits > 0)
         result = (result << lsb_bits) + get_bits(gbp, lsb_bits);
 
     result += m->sign_huff_offset[channel];
 
-    return result << quant_step_size;
+    *sample = result << quant_step_size;
+    return 0;
 }
 
 /** Initialize the decoder. */
@@ -776,10 +781,14 @@ static int read_block_data(MLPDecodeCont
                 m->bypassed_lsbs[i + m->blockpos[substr]][mat] = get_bits1(gbp);
 
         for (ch = m->min_channel[substr]; ch <= m->max_channel[substr]; ch++) {
-            int32_t sample = read_huff(m, gbp, substr, ch);
-            int32_t filtered = filter_sample(m, substr, ch, sample);
+            int32_t sample;
 
-            m->sample_buffer[i + m->blockpos[substr]][ch] = filtered;
+            if (read_huff(m, gbp, substr, ch, &sample) < 0)
+                return -1;
+
+            sample = filter_sample(m, substr, ch, sample);
+
+            m->sample_buffer[i + m->blockpos[substr]][ch] = sample;
         }
     }