Mercurial > libavcodec.hg

changeset 11428:6b0d65c8c13d libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
aacsbr: Propagate errors from read_sbr_grid to prevent crashes in malformatted streams.
author alexc
date Tue, 09 Mar 2010 06:13:48 +0000
parents 32504af93342
children 4eee52db3c4c
files aacsbr.c
diffstat 1 files changed, 17 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/aacsbr.c	Tue Mar 09 06:11:45 2010 +0000
+++ b/aacsbr.c	Tue Mar 09 06:13:48 2010 +0000
@@ -857,14 +857,15 @@
     }
 }
 
-static void read_sbr_single_channel_element(AACContext *ac,
+static int read_sbr_single_channel_element(AACContext *ac,
                                             SpectralBandReplication *sbr,
                                             GetBitContext *gb)
 {
     if (get_bits1(gb)) // bs_data_extra
         skip_bits(gb, 4); // bs_reserved
 
-    read_sbr_grid(ac, sbr, gb, &sbr->data[0]);
+    if (read_sbr_grid(ac, sbr, gb, &sbr->data[0]))
+        return -1;
     read_sbr_dtdf(sbr, gb, &sbr->data[0]);
     read_sbr_invf(sbr, gb, &sbr->data[0]);
     read_sbr_envelope(sbr, gb, &sbr->data[0], 0);
@@ -874,7 +875,7 @@
         get_bits1_vector(gb, sbr->data[0].bs_add_harmonic, sbr->n[1]);
 }
 
-static void read_sbr_channel_pair_element(AACContext *ac,
+static int read_sbr_channel_pair_element(AACContext *ac,
                                           SpectralBandReplication *sbr,
                                           GetBitContext *gb)
 {
@@ -882,7 +883,8 @@
         skip_bits(gb, 8); // bs_reserved
 
     if ((sbr->bs_coupling = get_bits1(gb))) {
-        read_sbr_grid(ac, sbr, gb, &sbr->data[0]);
+        if (read_sbr_grid(ac, sbr, gb, &sbr->data[0]))
+            return -1;
         copy_sbr_grid(&sbr->data[1], &sbr->data[0]);
         read_sbr_dtdf(sbr, gb, &sbr->data[0]);
         read_sbr_dtdf(sbr, gb, &sbr->data[1]);
@@ -894,8 +896,9 @@
         read_sbr_envelope(sbr, gb, &sbr->data[1], 1);
         read_sbr_noise(sbr, gb, &sbr->data[1], 1);
     } else {
-        read_sbr_grid(ac, sbr, gb, &sbr->data[0]);
-        read_sbr_grid(ac, sbr, gb, &sbr->data[1]);
+        if (read_sbr_grid(ac, sbr, gb, &sbr->data[0]) ||
+            read_sbr_grid(ac, sbr, gb, &sbr->data[1]))
+            return -1;
         read_sbr_dtdf(sbr, gb, &sbr->data[0]);
         read_sbr_dtdf(sbr, gb, &sbr->data[1]);
         read_sbr_invf(sbr, gb, &sbr->data[0]);
@@ -918,9 +921,15 @@
     unsigned int cnt = get_bits_count(gb);
 
     if (id_aac == TYPE_SCE || id_aac == TYPE_CCE) {
-        read_sbr_single_channel_element(ac, sbr, gb);
+        if (read_sbr_single_channel_element(ac, sbr, gb)) {
+            sbr->start = 0;
+            return get_bits_count(gb) - cnt;
+        }
     } else if (id_aac == TYPE_CPE) {
-        read_sbr_channel_pair_element(ac, sbr, gb);
+        if (read_sbr_channel_pair_element(ac, sbr, gb)) {
+            sbr->start = 0;
+            return get_bits_count(gb) - cnt;
+        }
     } else {
         av_log(ac->avccontext, AV_LOG_ERROR,
             "Invalid bitstream - cannot apply SBR to element type %d\n", id_aac);