diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-20 22:37:18 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-20 22:37:18 +0100 |
| commit | ee3822af631c27521fd15f94a00bdbc98eabd082 (patch) | |
| tree | 77cae0bf52120031a8336ca18c3ae1e23e917117 | |
| parent | fc5261c2190505a6d569afa6c7ada7a18b6c4998 (diff) | |
| download | ffmpeg-ee3822af631c27521fd15f94a00bdbc98eabd082.tar.gz | |
Allow decoding of slightly broken Nikon avi files.
Fixes ticket #3330.
(cherry picked from commit f9c2d4d17e3b18becb046d71811f9e8aa5946cf9)
| -rw-r--r-- | libavformat/avidec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 10116bd2a7..57beb6877d 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -348,6 +348,7 @@ static void avi_read_nikon(AVFormatContext *s, uint64_t end) uint16_t size = avio_rl16(s->pb); const char *name = NULL; char buffer[64] = { 0 }; + size = FFMIN(size, tag_end - avio_tell(s->pb)); size -= avio_read(s->pb, buffer, FFMIN(size, sizeof(buffer) - 1)); switch (tag) { |