diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-14 19:19:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-31 19:51:57 +0100 |
| commit | 3c0fcc7779d3de5fedd68e02a26aa5ca43a7f5d1 (patch) | |
| tree | 1a795d88b3e6d06be3839ec48ff0ae63e471e8bb | |
| parent | 60605ffa5c6760227334bc3ad3ce75dfadac72be (diff) | |
| download | ffmpeg-3c0fcc7779d3de5fedd68e02a26aa5ca43a7f5d1.tar.gz | |
avcodec/pnm: Check that the header is not truncated
Fixes: Ticket8430
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c94cb8d9b21baeeecef962c72965dbedc4e0b0e1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/pnm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index a9771710c2..9c9ae0dd7e 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -112,6 +112,9 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) return AVERROR_INVALIDDATA; } } + if (!pnm_space(s->bytestream[-1])) + return AVERROR_INVALIDDATA; + /* check that all tags are present */ if (w <= 0 || h <= 0 || maxval <= 0 || maxval > UINT16_MAX || depth <= 0 || tuple_type[0] == '\0' || av_image_check_size(w, h, 0, avctx) || s->bytestream >= s->bytestream_end) @@ -192,6 +195,10 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) } }else s->maxval=1; + + if (!pnm_space(s->bytestream[-1])) + return AVERROR_INVALIDDATA; + /* more check if YUV420 */ if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) { if ((avctx->width & 1) != 0) |