highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/id3v2: Check avio_read() return code in id3v2_parse()

Browse Source 
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f5a04a9b50d_7087_mp3__mp3__tooSmallFinal.mp3
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-15 15:42:53 +01:00
parent 037fc3b054
commit 0e0f6bd4a5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/id3v2.c
View File

@ -667,7 +667,8 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
unsigned long dlen; unsigned long dlen;
if (isv34) { if (isv34) {
avio_read(s->pb, tag, 4); if (avio_read(s->pb, tag, 4) < 0)
break;
tag[4] = 0; tag[4] = 0;
if (version == 3) { if (version == 3) {
tlen = avio_rb32(s->pb); tlen = avio_rb32(s->pb);
@ -676,7 +677,8 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
tflags = avio_rb16(s->pb); tflags = avio_rb16(s->pb);
tunsync = tflags & ID3v2_FLAG_UNSYNCH; tunsync = tflags & ID3v2_FLAG_UNSYNCH;
} else { } else {
avio_read(s->pb, tag, 3); if (avio_read(s->pb, tag, 3) < 0)
break;
tag[3] = 0; tag[3] = 0;
tlen = avio_rb24(s->pb); tlen = avio_rb24(s->pb);
} }