From patchwork Thu Mar 9 12:57:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40623 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp306875pzb; Thu, 9 Mar 2023 04:57:50 -0800 (PST) X-Google-Smtp-Source: AK7set/7HUHjjXXJRqzn3Wy514oCCFgZBmNeMufXyG2jMzDh9Hq+ml/6hcwU6/hxmfGo+FsHMTt4 X-Received: by 2002:a17:907:1c1f:b0:884:930:b014 with SMTP id nc31-20020a1709071c1f00b008840930b014mr27571440ejc.6.1678366669985; Thu, 09 Mar 2023 04:57:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678366669; cv=none; d=google.com; s=arc-20160816; b=QKCVh/oyi0A0HyLK3vKnHBkUxabet/DMgKeXwqwODBk5Cvo7z5Ln3ar/9gXEvAYQrk mxBXQRoridWz/iSee3+bf3CTa0U80nfWbsgHm/vgsW2cSGNZ0DBdCu62LcReYpbnt4OM PdFDhjp01GzYey/Kaw2dXjbGDqUntNoMLS+67SW8FWVnbKUFsEM5RwKMbfga8BqJS1CG O2ULPcXtcduPS9ucCCZXyiV67lC117tV2S8Z4auRpHN+4U3ty/vWleeY7hVLZ5rhttd3 f7empsdk2BqP+tCRk+RhbZKkqbbi2yyY0NFzhTXrmU8vehwhVk8+NmTzglZoo4LHzOxr 5XIg== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=nivKOnO1ZMC/tpYaeupCajR/LL/kIESXpiE2dLtVv7s=; b=ei0UPReGB+bmzMC9WsKl3rPqGAn0Yy3WxLV6jKVZ8yr3mfGlrr2jTeq+xeQiwwclh7 egGLP7knpzbqaGxKKm9BTe+RjZa41+a+boQv33zWr7SHZbvKFP8CwoQbKSz7UvKzCxI2 QmsmJOcl85pc6VoooBKEh3yGcOGXqpJxyyKVZXqu6KQUd9udRAUqkz1l9FDpLvyAKMec tVTNnh6l8CGyOHHE4Hb5zsJiL/mPNpgrwf/QIEaIYCDOirKVT82mdu9Nhmq97DBdryoj oDgB87vC+1qxUhnlP+UDY/lI47zm3eMl3xlZSlG8U+/NMQ5CCQ3HHFzeCZB6fdcg/F7k XBDA== 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 w23-20020a170906481700b008b17e1a54edsi1959207ejq.788.2023.03.09.04.57.49; Thu, 09 Mar 2023 04:57:49 -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 E09C268BD14; Thu, 9 Mar 2023 14:57:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2085968BAA5 for ; Thu, 9 Mar 2023 14:57:21 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 77BFDFF80B for ; Thu, 9 Mar 2023 12:57:20 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 9 Mar 2023 13:57:16 +0100 Message-Id: <20230309125717.29821-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230309125717.29821-1-michael@niedermayer.cc> References: <20230309125717.29821-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/lcldec: 420 seems missing 2 bytes, ignore that 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: hg9/fFmumH+I Fixes: Ticket 10238 Fixes: mszh_306_306_yuv420.avi Signed-off-by: Michael Niedermayer --- libavcodec/lcldec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 0196460eb2..f9a0755e4d 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -219,7 +219,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, if (c->decomp_size != mszh_dlen) { av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %d)\n", c->decomp_size, mszh_dlen); - return AVERROR_INVALIDDATA; + if (c->decomp_size != mszh_dlen && + c->decomp_size != mszh_dlen + 2) // YUV420 306x306 is missing 2 bytes + return AVERROR_INVALIDDATA; } encoded = c->decomp_buf; len = mszh_dlen;