Commit 1cd89f27 authored by Michael Niedermayer's avatar Michael Niedermayer

segfault fix

Originally committed as revision 4531 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2185824b
......@@ -198,6 +198,8 @@ static int pnm_decode_frame(AVCodecContext *avctx,
do_read:
ptr = p->data[0];
linesize = p->linesize[0];
if(s->bytestream + n*avctx->height > s->bytestream_end)
return -1;
for(i = 0; i < avctx->height; i++) {
memcpy(ptr, s->bytestream, n);
s->bytestream += n;
......@@ -211,6 +213,8 @@ static int pnm_decode_frame(AVCodecContext *avctx,
n = avctx->width;
ptr = p->data[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++) {
memcpy(ptr, s->bytestream, n);
s->bytestream += n;
......@@ -233,6 +237,8 @@ static int pnm_decode_frame(AVCodecContext *avctx,
case PIX_FMT_RGBA32:
ptr = p->data[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++) {
int j, r, g, b, a;
......
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