RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/dvbsub_parser: Fix potential pointer overflows 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-15 18:20:58 +01:00
parent 84da9339c2
commit de41d5372f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dvbsub_parser.c
View File

@ -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,
} 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");
} }