mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
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>
This commit is contained in:
parent
74673ba276
commit
758119ca41
@ -108,6 +108,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 || depth <= 0 || tuple_type[0] == '\0' || av_image_check_size(w, h, 0, avctx) || s->bytestream >= s->bytestream_end)
|
||||
return AVERROR_INVALIDDATA;
|
||||
@ -187,6 +190,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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user