[FFmpeg-cvslog] avcodec/cscd: Fix "CamStudio Lossless Codec 1.0" gzip files
Michael Niedermayer
git at videolan.org
Sun Sep 10 17:43:33 EEST 2023
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Sep 10 16:27:02 2023 +0200| [ab7d38f970674e6765b5e1adb911c1763b9ce806] | committer: Michael Niedermayer
avcodec/cscd: Fix "CamStudio Lossless Codec 1.0" gzip files
Fixes: tickets/10241/cscd_1_0_306_306_gzip.avi
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab7d38f970674e6765b5e1adb911c1763b9ce806
---
libavcodec/cscd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c
index 2ece38d823..685cf18cec 100644
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@@ -70,6 +70,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe,
int buf_size = avpkt->size;
CamStudioContext *c = avctx->priv_data;
int ret;
+ int bpp = avctx->bits_per_coded_sample / 8;
+ int bugdelta = FFALIGN(avctx->width * bpp, 4) * avctx->height
+ - (avctx->width & ~3) * bpp * avctx->height;
if (buf_size < 2) {
av_log(avctx, AV_LOG_ERROR, "coded frame too small\n");
@@ -83,9 +86,6 @@ 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;
- 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;
@@ -95,7 +95,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe,
case 1: { // zlib compression
#if CONFIG_ZLIB
unsigned long dlen = c->decomp_size;
- if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK || dlen != c->decomp_size) {
+ if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK || (dlen != c->decomp_size && dlen != c->decomp_size - bugdelta)) {
av_log(avctx, AV_LOG_ERROR, "error during zlib decompression\n");
return AVERROR_INVALIDDATA;
}
More information about the ffmpeg-cvslog
mailing list