From patchwork Wed Mar 8 22:43:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40617 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp803086pzb; Wed, 8 Mar 2023 14:44:17 -0800 (PST) X-Google-Smtp-Source: AK7set+BbbWxzi3/u+w/HClRYSWr/urFf/fbJzZKzJeu1fW2O2DXvkaDby3Ho2oWw1aQuMrUr628 X-Received: by 2002:a17:907:961c:b0:8b1:811e:cd30 with SMTP id gb28-20020a170907961c00b008b1811ecd30mr24683229ejc.22.1678315456857; Wed, 08 Mar 2023 14:44:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678315456; cv=none; d=google.com; s=arc-20160816; b=hSJyzFtBq69a+37OcWPVMv55LqenUJ/kv5ZQhH5cWxI39X+iNHuGH7IyXPEm8tzc6S JVM0bE4aaGPWNz9vxUTt2FjyL2KbuwOLIjUOw0vkYU7kDewQG20n0QsaN+qZpF7NwVEc T/OFa5W71HcaVsXi6qjeUrPyyA7p3PadJhP2WULR7Mzgu6/Sn6u/yXr6K/1CIFsq96EQ nyc9JpKKr8Uencks43y1YeTbeUSuAGVz7rKXmiCMKrw/ltJG6HCC3jUatj6EQBAz11kA evtx/vxlljb45N+/iy/xVZMedFDXhv8etwyUph8qt4iBoLRJNIRD8S9GvlVNNW88ciZf WpKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=97Y8l4sA3m7HlxY4fdZFrXgRRh/kuBv1ErT75xtUwB8=; b=nSkDxAhQNOLzGWfa89g8Kjg1NQ+VjeVlgm9o3VFRDo5wQoU5lwjoWxfLAODYEf2hr4 ObwIR00+XB7oy2JgRm/+MPnchcR37Ou/gs9inbMQnYqEy8yA+AlQpsj+bVJXaQmsKL2i cvD7ga5toycuaaS/T5/IHi6DrpMF3hai4X02c3lHfI/pxFyKkQREuQpumyBWDGkVfs2D qlxgFjpDLEKzfwtev/oeKiKBNV/MJr6trAONnhkALZUqmIUjKD0Kfk6BFf/8Wzjy6XyC gPeNfFfua0AXvRchA6KJKfDA1x7KWdCAus8f+3NPUerlx1UfCWoBxTcNlMIuxc7xIVnq /poA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v9-20020aa7d809000000b004ad79751752si4564103edq.645.2023.03.08.14.43.52; Wed, 08 Mar 2023 14:44:16 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1D9768BD6E; Thu, 9 Mar 2023 00:43:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B4FA68BC41 for ; Thu, 9 Mar 2023 00:43:40 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 1A59B1C0003 for ; Wed, 8 Mar 2023 22:43:38 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 8 Mar 2023 23:43:38 +0100 Message-Id: <20230308224338.31226-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/cscd: Check for CamStudio Lossless Codec 1.0 behavior in end check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0Pn861oHKTD7 Alternatively the check could be simply made more tolerant Fixes: Ticket10227 Signed-off-by: Michael Niedermayer --- libavcodec/cscd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index b4ed3332a9..5d55f6e4d1 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; }