diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-09-05 10:06:25 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-09-05 10:06:25 +0200 |
| commit | e7bc9623e577e41d0dfd8ec2e1d1ec0d36333754 (patch) | |
| tree | 0396a672ae07211b0d3e7481233043180f8bf7b5 /libavcodec/pnmdec.c | |
| parent | 880d8e88ee74f6a09e7bd22ef6057d4e6e8b2eae (diff) | |
| download | ffmpeg-e7bc9623e577e41d0dfd8ec2e1d1ec0d36333754.tar.gz | |
avcodec/pnmdec: fix undefined behaviour
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/pnmdec.c')
| -rw-r--r-- | libavcodec/pnmdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index d4261a4530..ca97cc38c3 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++) { |