RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid a possible overflow when reading Nikon avi files. 

Suggested-by: Reimar
This commit is contained in:
Carl Eugen Hoyos 2014-01-20 11:40:35 +01:00
parent 9b78abae19
commit b7702fafb3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/avidec.c
View File

@ -350,8 +350,7 @@ static void avi_read_nikon(AVFormatContext *s, uint64_t end)
uint16_t size = avio_rl16(s->pb); uint16_t size = avio_rl16(s->pb);
const char *name = NULL; const char *name = NULL;
char buffer[64] = { 0 }; char buffer[64] = { 0 };
if (avio_tell(s->pb) + size > tag_end) size = FFMIN(size, tag_end - avio_tell(s->pb));
size = tag_end - avio_tell(s->pb);
size -= avio_read(s->pb, buffer, size -= avio_read(s->pb, buffer,
FFMIN(size, sizeof(buffer) - 1)); FFMIN(size, sizeof(buffer) - 1));
switch (tag) { switch (tag) {