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:
d5eca16
)
avcodec/dvdsub_parser: Check buf_size before reading 32bit packet size
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 1 Aug 2014 23:15:37 +0000
(
01:15
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 28 Nov 2014 17:44:36 +0000
(18:44 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
81c1657a593b1c0f8e46fca00ead1d30ee1cd418
)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dvdsub_parser.c
patch
|
blob
|
history
diff --git
a/libavcodec/dvdsub_parser.c
b/libavcodec/dvdsub_parser.c
index
9a6457e
..
07ed4f7
100644
(file)
--- a/
libavcodec/dvdsub_parser.c
+++ b/
libavcodec/dvdsub_parser.c
@@
-45,8
+45,9
@@
static int dvdsub_parse(AVCodecParserContext *s,
DVDSubParseContext *pc = s->priv_data;
if (pc->packet_index == 0) {
- if (buf_size < 2
)
+ if (buf_size < 2
|| AV_RB16(buf) && buf_size < 6) {
return buf_size;
+ }
pc->packet_len = AV_RB16(buf);
if (pc->packet_len == 0) /* HD-DVD subpicture packet */
pc->packet_len = AV_RB32(buf+2);