diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 21:33:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 21:33:44 +0100 |
| commit | 9e96051d5d03c13692090bff5c804fa5aaa11375 (patch) | |
| tree | 52de7c663d6e1a57cb9814634e3abda648520eeb /libavformat/dsicin.c | |
| parent | 85c02da3076893dc09fe25152754ae072b59a837 (diff) | |
| parent | 68a1df13c460adb6241cfdf96aad953b5d637623 (diff) | |
| download | ffmpeg-9e96051d5d03c13692090bff5c804fa5aaa11375.tar.gz | |
Merge commit '68a1df13c460adb6241cfdf96aad953b5d637623' into release/0.10
* commit '68a1df13c460adb6241cfdf96aad953b5d637623':
smacker: Avoid integer overflow when allocating packets
smacker: Don't return packets in unallocated streams
dsicin: Add some basic sanity checks for fields read from the file
arm: Don't clobber callee saved registers in scalarproduct
Prepare for 0.8.10 Release
roqvideodec: check dimensions validity
qdm2: check array index before use, fix out of array accesses
alsdec: check block length
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/dsicin.c')
| -rw-r--r-- | libavformat/dsicin.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c index e0db8ba10e..f7ae216a23 100644 --- a/libavformat/dsicin.c +++ b/libavformat/dsicin.c @@ -153,6 +153,8 @@ static int cin_read_frame_header(CinDemuxContext *cin, AVIOContext *pb) { if (avio_rl32(pb) != 0xAA55AA55) return AVERROR_INVALIDDATA; + if (hdr->video_frame_size < 0 || hdr->audio_frame_size < 0) + return AVERROR_INVALIDDATA; return 0; } |