RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/rawdec: Check height and packet size 

Avoids potential division by 0

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-01-25 03:42:45 +01:00
parent 82325dbec1
commit 46f67f4a34
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/rawdec.c
View File

@ -156,13 +156,24 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
RawVideoContext *context = avctx->priv_data; RawVideoContext *context = avctx->priv_data;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
int avpkt_stride = avpkt->size / avctx->height;
int linesize_align = 4; int linesize_align = 4;
int avpkt_stride;
int res, len; int res, len;
int need_copy; int need_copy;
AVFrame *frame = data; 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 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->bits_per_coded_sample == 2 || avctx->bits_per_coded_sample == 1) &&
avctx->pix_fmt == AV_PIX_FMT_PAL8 && avctx->pix_fmt == AV_PIX_FMT_PAL8 &&