From 57da3eb525e6482be5d7137a8db9a24446111695 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Sun, 2 Jun 2013 13:12:26 -0700 Subject: [PATCH] Fix audio_codec index out-of-bounds access (coverity-709369). --- src/modules/avformat/producer_avformat.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index 89d59b7e..1b87b86d 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -2537,14 +2537,11 @@ static void producer_set_up_audio( producer_avformat self, mlt_frame frame ) audio_codec_init( self, index, properties ); } } - else if ( context && index > -1 && audio_codec_init( self, index, properties ) ) + else if ( context && index > -1 && index < MAX_AUDIO_STREAMS && + audio_codec_init( self, index, properties ) ) { - // Set the frame properties - if ( index < MAX_AUDIO_STREAMS ) - { - mlt_properties_set_int( frame_properties, "audio_frequency", self->audio_codec[ index ]->sample_rate ); - mlt_properties_set_int( frame_properties, "audio_channels", self->audio_codec[ index ]->channels ); - } + mlt_properties_set_int( frame_properties, "audio_frequency", self->audio_codec[ index ]->sample_rate ); + mlt_properties_set_int( frame_properties, "audio_channels", self->audio_codec[ index ]->channels ); } if ( context && index > -1 ) { -- 2.39.2