[FFmpeg-cvslog] avcodec/cscd: Check for CamStudio Lossless Codec 1.0 behavior in end check of LZO files
Michael Niedermayer
git at videolan.org
Sun Sep 10 17:43:31 EEST 2023
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Mar 8 22:11:59 2023 +0100| [d2a0464fc2dd6f79571a66e6c7a8168323168e46] | committer: Michael Niedermayer
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2a0464fc2dd6f79571a66e6c7a8168323168e46
---
libavcodec/cscd.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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;
}
More information about the ffmpeg-cvslog
mailing list