ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Mon Sep 5 10:06:25 2016 +0200| [e7bc9623e577e41d0dfd8ec2e1d1ec0d36333754] | committer: Paul B Mahol
avcodec/pnmdec: fix undefined behaviour Signed-off-by: Paul B Mahol <one...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7bc9623e577e41d0dfd8ec2e1d1ec0d36333754 --- libavcodec/pnmdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index d4261a4..ca97cc3 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -124,7 +124,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, do_read: ptr = p->data[0]; linesize = p->linesize[0]; - if (s->bytestream + n * avctx->height > s->bytestream_end) + if (n * avctx->height > s->bytestream_end - s->bytestream) return AVERROR_INVALIDDATA; if(s->type < 4 || (is_mono && s->type==7)){ for (i=0; i<avctx->height; i++) { @@ -188,7 +188,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, linesize = p->linesize[0]; if (s->maxval >= 256) n *= 2; - if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end) + if (n * avctx->height * 3 / 2 > s->bytestream_end - s->bytestream) return AVERROR_INVALIDDATA; for (i = 0; i < avctx->height; i++) { samplecpy(ptr, s->bytestream, n, s->maxval); @@ -218,7 +218,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, n = avctx->width * 2; ptr = p->data[0]; linesize = p->linesize[0]; - if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end) + if (n * avctx->height * 3 / 2 > s->bytestream_end - s->bytestream) return AVERROR_INVALIDDATA; for (i = 0; i < avctx->height; i++) { for (j = 0; j < n / 2; j++) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
