swr: check channel layouts before using them.
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 16:49:16 +0000 (17:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 16:50:24 +0000 (17:50 +0100)
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswresample/swresample.c

index b192bfd..9c2e3f5 100644 (file)
@@ -265,6 +265,16 @@ av_cold int swr_init(struct SwrContext *s){
         return AVERROR(EINVAL);
     }
 
+    if(av_get_channel_layout_nb_channels(s-> in_ch_layout) > SWR_CH_MAX) {
+        av_log(s, AV_LOG_WARNING, "Input channel layout 0x%"PRIx64" is invalid or unsupported.\n", s-> in_ch_layout);
+        s->in_ch_layout = 0;
+    }
+
+    if(av_get_channel_layout_nb_channels(s->out_ch_layout) > SWR_CH_MAX) {
+        av_log(s, AV_LOG_WARNING, "Output channel layout 0x%"PRIx64" is invalid or unsupported.\n", s->out_ch_layout);
+        s->out_ch_layout = 0;
+    }
+
     switch(s->engine){
 #if CONFIG_LIBSOXR
         extern struct Resampler const soxr_resampler;