Commit de41d537 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/dvbsub_parser: Fix potential pointer overflows

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 84da9339
...@@ -122,11 +122,11 @@ static int dvbsub_parse(AVCodecParserContext *s, ...@@ -122,11 +122,11 @@ static int dvbsub_parse(AVCodecParserContext *s,
{ {
if (*p == 0x0f) if (*p == 0x0f)
{ {
if (p + 6 <= p_end) if (6 <= p_end - p)
{ {
len = AV_RB16(p + 4); len = AV_RB16(p + 4);
if (p + len + 6 <= p_end) if (len + 6 <= p_end - p)
{ {
*poutbuf_size += len + 6; *poutbuf_size += len + 6;
...@@ -136,7 +136,7 @@ static int dvbsub_parse(AVCodecParserContext *s, ...@@ -136,7 +136,7 @@ static int dvbsub_parse(AVCodecParserContext *s,
} else } else
break; break;
} else if (*p == 0xff) { } else if (*p == 0xff) {
if (p + 1 < p_end) if (1 < p_end - p)
{ {
av_dlog(avctx, "Junk at end of packet\n"); av_dlog(avctx, "Junk at end of packet\n");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment