[FFmpeg-devel] [PATCH] wav: Add check for in SMV code for fmt tag

Derek Buitenhuis derek.buitenhuis at gmail.com
Sun Jul 22 22:01:12 CEST 2012


If there is a 'SMV0' tag, but no 'fmt' tag, it is possible that
'st' got used as NULL.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
---
 libavformat/wav.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/wav.c b/libavformat/wav.c
index c408623..928f82d 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -480,6 +480,10 @@ static int wav_read_header(AVFormatContext *s)
                 return ret;
             break;
         case MKTAG('S','M','V','0'):
+            if (!got_fmt) {
+                av_log(s, AV_LOG_ERROR, "found no 'fmt ' tag before the 'SMV0' tag\n");
+                return AVERROR_INVALIDDATA;
+            }
             // SMV file, a wav file with video appended.
             if (size != MKTAG('0','2','0','0')) {
                 av_log(s, AV_LOG_ERROR, "Unknown SMV version found\n");
-- 
1.7.10.4



More information about the ffmpeg-devel mailing list