virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  8bps: Make the bound-checks consistent

Conflicts:
	libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-24 12:01:29 +02:00
commit 7dec8512be
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/8bps.c
View File

@ -96,7 +96,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
if ((count = *dp++) <= 127) { if ((count = *dp++) <= 127) {
count++; count++;
dlen -= count + 1; dlen -= count + 1;
if (pixptr + count * planes > pixptr_end) if (pixptr_end - pixptr < count * planes)
break; break;
if (ep - dp < count) if (ep - dp < count)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -106,7 +106,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
} }
} else { } else {
count = 257 - count; count = 257 - count;
if (pixptr + count * planes > pixptr_end) if (pixptr_end - pixptr < count * planes)
break; break;
while (count--) { while (count--) {
*pixptr = *dp; *pixptr = *dp;