generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

segfault fix

Browse Source 
Originally committed as revision 4531 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-08-21 15:44:59 +00:00
parent 2185824b10
commit 1cd89f276a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/pnm.c
View File

@ -198,6 +198,8 @@ static int pnm_decode_frame(AVCodecContext *avctx,
do_read: do_read:
ptr = p->data[0]; ptr = p->data[0];
linesize = p->linesize[0]; linesize = p->linesize[0];
if(s->bytestream + n*avctx->height > s->bytestream_end)
return -1;
for(i = 0; i < avctx->height; i++) { for(i = 0; i < avctx->height; i++) {
memcpy(ptr, s->bytestream, n); memcpy(ptr, s->bytestream, n);
s->bytestream += n; s->bytestream += n;
@ -211,6 +213,8 @@ static int pnm_decode_frame(AVCodecContext *avctx,
n = avctx->width; n = avctx->width;
ptr = p->data[0]; ptr = p->data[0];
linesize = p->linesize[0]; linesize = p->linesize[0];
if(s->bytestream + n*avctx->height*3/2 > s->bytestream_end)
return -1;
for(i = 0; i < avctx->height; i++) { for(i = 0; i < avctx->height; i++) {
memcpy(ptr, s->bytestream, n); memcpy(ptr, s->bytestream, n);
s->bytestream += n; s->bytestream += n;
@ -233,6 +237,8 @@ static int pnm_decode_frame(AVCodecContext *avctx,
case PIX_FMT_RGBA32: case PIX_FMT_RGBA32:
ptr = p->data[0]; ptr = p->data[0];
linesize = p->linesize[0]; linesize = p->linesize[0];
if(s->bytestream + avctx->width*avctx->height*4 > s->bytestream_end)
return -1;
for(i = 0; i < avctx->height; i++) { for(i = 0; i < avctx->height; i++) {
int j, r, g, b, a; int j, r, g, b, a;