[FFmpeg-cvslog] avformat/wavdec: check smv_frames_per_jpeg

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 26 14:48:43 2013 +0200| [e02495372240ad826a8a6b2ecb035bf001b64344] | committer: Michael Niedermayer

avformat/wavdec: check smv_frames_per_jpeg

Values outside would not be possible due to limitations of jpeg itself

Fixes very long running loop
Fixes Ticket2977

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e02495372240ad826a8a6b2ecb035bf001b64344
---

 libavformat/wavdec.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 9a01705..9e247e3 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -369,6 +369,10 @@ static int wav_read_header(AVFormatContext *s)
             avio_rl24(pb);
             avio_rl24(pb);
             wav->smv_frames_per_jpeg = avio_rl24(pb);
+            if (wav->smv_frames_per_jpeg > 65536) {
+                av_log(s, AV_LOG_ERROR, "too many frames per jpeg\n");
+                return AVERROR_INVALIDDATA;
+            }
             AV_WL32(vst->codec->extradata, wav->smv_frames_per_jpeg);
             wav->smv_cur_pt = 0;
             goto break_loop;