diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-22 23:59:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-23 00:00:03 +0200 |
| commit | d486a6eae9a2dbbbfdad43f598a44831cd259952 (patch) | |
| tree | 5f27c87dc61b043d281c32494dabbda6c18abf4e | |
| parent | 88beb2df982aa4de257f742ff41f777927cc5173 (diff) | |
| parent | 5ab855777de94ba616a9c42fbd0f2947f95deb89 (diff) | |
| download | ffmpeg-d486a6eae9a2dbbbfdad43f598a44831cd259952.tar.gz | |
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
wav: Add check for 'fmt' tag in SMV code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/wav.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/wav.c b/libavformat/wav.c index c408623f36..928f82d1e1 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"); |