diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2023-03-08 22:11:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2023-09-10 16:40:49 +0200 |
| commit | d2a0464fc2dd6f79571a66e6c7a8168323168e46 (patch) | |
| tree | 484a16a87342dd6c4e14b1bc87cc60d45ff4ccfe /libavcodec/cscd.c | |
| parent | c6f0fd2dcdb02f0894f143ae3ef0e2029200953a (diff) | |
avcodec/cscd: Check for CamStudio Lossless Codec 1.0 behavior in end check of LZO files
Alternatively the check could be simply made more tolerant
Fixes: Ticket10227
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/cscd.c')
| -rw-r--r-- | libavcodec/cscd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 23dd2df99e..2ece38d823 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -83,7 +83,10 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, switch ((buf[0] >> 1) & 7) { case 0: { // lzo compression int outlen = c->decomp_size, inlen = buf_size - 2; - if (av_lzo1x_decode(c->decomp_buf, &outlen, &buf[2], &inlen) || outlen) { + int bpp = avctx->bits_per_coded_sample / 8; + int bugdelta = FFALIGN(avctx->width * bpp, 4) * avctx->height + - (avctx->width & ~3) * bpp * avctx->height; + if (av_lzo1x_decode(c->decomp_buf, &outlen, &buf[2], &inlen) || (outlen && outlen != bugdelta)) { av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); return AVERROR_INVALIDDATA; } |