Commit 46f67f4a authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/rawdec: Check height and packet size

Avoids potential division by 0
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 82325dbe
......@@ -156,13 +156,24 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
RawVideoContext *context = avctx->priv_data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
int avpkt_stride = avpkt->size / avctx->height;
int linesize_align = 4;
int avpkt_stride;
int res, len;
int need_copy;
AVFrame *frame = data;
if (avctx->height <= 0) {
av_log(avctx, AV_LOG_ERROR, "height is not set\n");
return AVERROR_INVALIDDATA;
}
avpkt_stride = avpkt->size / avctx->height;
if (avpkt_stride == 0) {
av_log(avctx, AV_LOG_ERROR, "Packet too small (%d) height (%d)\n", avpkt->size, avctx->height);
return AVERROR_INVALIDDATA;
}
if ((avctx->bits_per_coded_sample == 8 || avctx->bits_per_coded_sample == 4
|| avctx->bits_per_coded_sample == 2 || avctx->bits_per_coded_sample == 1) &&
avctx->pix_fmt == AV_PIX_FMT_PAL8 &&
......
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