dvdec: check ipcm more completely, avoid assert failure.
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Nov 2012 18:37:47 +0000 (19:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Nov 2012 20:45:53 +0000 (21:45 +0100)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dv.c

index f3d88e4..a04735a 100644 (file)
@@ -142,6 +142,11 @@ static int dv_extract_audio(uint8_t* frame, uint8_t* ppcm[4],
      * channels 0,1 and odd 2,3. */
     ipcm = (sys->height == 720 && !(frame[1] & 0x0C)) ? 2 : 0;
 
+    if (ipcm + sys->n_difchan > (quant == 1 ? 2 : 4)) {
+        av_log(NULL, AV_LOG_ERROR, "too many dv pcm frames\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     /* for each DIF channel */
     for (chan = 0; chan < sys->n_difchan; chan++) {
         av_assert0(ipcm<4);