generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

id3v2: catch avio_read errors in check_tag

Browse Source 
Since len is an unsigned int, the comparison is currently treated as
unsigned and thus ignores all errors from avio_read.

Thus cast len to int, which is unproblematic, because at that point len
is between 0 and 4.

This fixes 'Conditional jump or move depends on uninitialised value'
valgrind warnings in is_tag.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0382c94f13)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Andreas Cadhalpun
2015-05-11 20:07:49 +02:00
committed by Michael Niedermayer
parent 699357dd4e
commit 596b9d6ed8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/id3v2.c
View File

@@ -204,7 +204,7 @@ static int check_tag(AVIOContext *s, int offset, unsigned int len)
if (len > 4 || if (len > 4 ||
avio_seek(s, offset, SEEK_SET) < 0 || avio_seek(s, offset, SEEK_SET) < 0 ||
avio_read(s, tag, len) < len) avio_read(s, tag, len) < (int)len)
return -1; return -1;
else if (!AV_RB32(tag) || is_tag(tag, len)) else if (!AV_RB32(tag) || is_tag(tag, len))
return 1; return 1;