diff options
author | Paul B Mahol <onemda@gmail.com> | 2016-12-24 10:31:43 +0100 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2016-12-24 10:31:43 +0100 |
commit | 6cedd20b97292acdbfc5a30decbaa9bd62f287f8 (patch) | |
tree | 700edd224280f726903482458414f4cde9a9d4b2 /libavcodec/pixlet.c | |
parent | ab31b46b89362041a8e37cb0aac67cf3b53c2524 (diff) | |
download | ffmpeg-6cedd20b97292acdbfc5a30decbaa9bd62f287f8.tar.gz |
avcodec/pixlet: make sure scaling factors are not zero
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/pixlet.c')
-rw-r--r-- | libavcodec/pixlet.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c index e78b666359..0f13b5bac9 100644 --- a/libavcodec/pixlet.c +++ b/libavcodec/pixlet.c @@ -504,8 +504,14 @@ static int decode_plane(AVCodecContext *avctx, int plane, AVPacket *avpkt, AVFra int i, ret; for (i = ctx->levels - 1; i >= 0; i--) { - ctx->scaling[plane][H][i] = 1000000.0f / sign_extend(bytestream2_get_be32(&ctx->gb), 32); - ctx->scaling[plane][V][i] = 1000000.0f / sign_extend(bytestream2_get_be32(&ctx->gb), 32); + int32_t h = sign_extend(bytestream2_get_be32(&ctx->gb), 32); + int32_t v = sign_extend(bytestream2_get_be32(&ctx->gb), 32); + + if (!h || !v) + return AVERROR_INVALIDDATA; + + ctx->scaling[plane][H][i] = 1000000.0f / h; + ctx->scaling[plane][V][i] = 1000000.0f / v; } bytestream2_skip(&ctx->gb, 4); |