OSDN Git Service

Check sampling index validity for AAC decoding
authorJai Menon <realityman@gmx.net>
Tue, 10 Feb 2009 13:47:50 +0000 (13:47 +0000)
committerRobert Swain <robert.swain@gmail.com>
Tue, 10 Feb 2009 13:47:50 +0000 (13:47 +0000)
Patch by Jai Menon ( jmenon86 gmail com )

Originally committed as revision 17131 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/aac.c

index 87b58bc..7275430 100644 (file)
@@ -1555,6 +1555,10 @@ static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data
             av_log(avccontext, AV_LOG_ERROR, "Error decoding AAC frame header.\n");
             return -1;
         }
+        if (ac->m4ac.sampling_index > 11) {
+            av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index);
+            return -1;
+        }
     }
 
     // parse