OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
460f8fc
)
avformat/id3v2: Check avio_read() return value in read_chapter()
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Dec 2013 19:57:19 +0000
(20:57 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Dec 2013 21:11:28 +0000
(22:11 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/id3v2.c
patch
|
blob
|
history
diff --git
a/libavformat/id3v2.c
b/libavformat/id3v2.c
index
effaaf4
..
6c82632
100644
(file)
--- a/
libavformat/id3v2.c
+++ b/
libavformat/id3v2.c
@@
-544,7
+544,8
@@
static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, char *tta
len -= 16;
while (len > 10) {
- avio_read(pb, tag, 4);
+ if (avio_read(pb, tag, 4) < 4)
+ goto end;
tag[4] = 0;
taglen = avio_rb32(pb);
avio_skip(pb, 2);