aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-02 01:15:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-05 04:14:02 +0200
commitce248bf7ee4e03d997faef00d1eae60c520f278c (patch)
tree31589848a9be05179026f70b845a81d3efd8f6de
parent8eaefbe1beb551480c68f24d9d5c84bfbc27b465 (diff)
downloadffmpeg-ce248bf7ee4e03d997faef00d1eae60c520f278c.tar.gz
avcodec/dvdsub_parser: Check buf_size before reading 32bit packet size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 81c1657a593b1c0f8e46fca00ead1d30ee1cd418) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/dvdsub_parser.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c
index 9a6457e8b4..07ed4f72fc 100644
--- 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);