From patchwork Sun Oct 8 13:17:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44211 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp897804pzb; Sun, 8 Oct 2023 06:18:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGtcFmX71Vm8dRrwTlfSC+PzeZqdi2RyPkjyQ1rVDnecktr++rL4thwZVTiiwhdacbe+2Qc X-Received: by 2002:aa7:cfda:0:b0:523:40d0:34d1 with SMTP id r26-20020aa7cfda000000b0052340d034d1mr10764615edy.4.1696771081023; Sun, 08 Oct 2023 06:18:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696771081; cv=none; d=google.com; s=arc-20160816; b=flbUl2aNfY1KhnnghDRKhWl1wO3TRCeJsUCL95MHAzQ0g+FS+3gY+CtREfy3oS9rWE 7XtWdEfIKbaqCNOB9VKpEP5nLIm3RQqf8SbhdgM5wICCBXhDihxy3FlCEa0Xlo98ARPZ ac+UDOp50yqFo7CLO+T9PSj+nqkDj3zMppwTPBEobyLBvp7Vqyi4Ut3JppI11i0031x1 4YgPjrfu77kWgYZ8Nzr/6ZGL8XFw87UTJnGLiyr1F4GxbFG0N5ZDio0A26vXH68LuXb/ K80cB8y41uhp4UfQE1TfSZrCzdm3dCLmYtU6MzLdbbMWGIsEVHcbhC9QEaWQMDDErz6M sDUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=NqCTb1Ap+Fnz73QA9cSrxS8OZOW/bEFnkyYSccW5PkY=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=vOj+5lV0a2aA7nqKm+Rg/7Y5j1BWMekLNH4tMU7RNdqz3hW3/AjuRjPQAR+sPD4UDT b+xrMOMPyhljq8VRpmnVyzvONfQX4ZRyTlmIJI0WY1wUJ/mPRpu2HLzqOGmFx55Ljlx9 v0egdlW7gIVvIP0B/ozrGgwqUChgbQR7vFGkoJ1pha4u5dw1ErV5OcGQ1XJCG08P70p8 PYs5qhcuAPjmREWdjeXxHeRUxuZwLseEeyhrGkPGz31PfofYt3anWva95iEkoU0SA42J SNb6S292hQHCU+FQXqu8jSKpyhMyZxmrogbptBXWfGZ6WnfZK0bonhkxaB9sPsfpTsbe RUnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=h2gva6Ma; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d11-20020aa7c1cb000000b0053628c38826si3493825edp.655.2023.10.08.06.18.00; Sun, 08 Oct 2023 06:18:01 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=h2gva6Ma; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36FDD68C8BE; Sun, 8 Oct 2023 16:17:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9776868C982 for ; Sun, 8 Oct 2023 16:17:35 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1696771046; bh=F2k6prxiA4cDE1HQ41sgxPVexQofbSaZAe2/CXJaRtQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h2gva6MaB/pHRCqFN6OFzfugoVSwbKqkf80su/ejXFTsc3irZrQNm0hn32FakqruR SO1XwXN18N9CKW/XElds9hHr7vAnaszw4CbT0+Nia+5d5roKV+BZI/58Zq+ivRBIs/ F5SEi3vQ9ey+WBcG+8wnZpGr0OUPVHNDr6TLTZ9o= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.188]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id 443BAA97; Sun, 08 Oct 2023 21:17:03 +0800 X-QQ-mid: xmsmtpt1696771045tucgrrs0v Message-ID: X-QQ-XMAILINFO: Mk9vQ32lX3ut0ayhDgTar/1kucNF8XJlOq+8jrn8uM6XccL9MLsUpu6Nf/03Yw wWc3C173SULDBOMOr+Ob0n7ytRu8QNzw+JS5OHNpPkw2GdHUqneqZsn3+w4xIByPJJJwkr9YBDHN vzErAi/b6hwNcyu8ejAObz7UbHSNHtLornmT01MSr4jrbbMCYZCI6VK/34ViZl0FILGmKD8Od5VM sbcRQL/l2Nzt8f1iunntzIyygeMxFUN2bDV47t1OykwTLnstYvS0NL5rlRpGutt7IS9aTMdtu4j4 muK78ub74sltQO6FZ3jWQnhNXv1X0EYXhBnsvk0g8bra5p4ll/ohAtIkhi1vMNe5XiL5tZQ7f5jh UVBq1acC8B+fgn8p2Xc63t+LMWgfVZBLjlbYkUKMOiC7/33nLZMVwWAu3ZSt+DXlRamc5k3VaG+3 lht9jVTurS6Yc2vMlEqngXISFTBKi5FuDBm3IFb2lS5Ls5+yS2i3t9vrKiL6qibew61lvPndNU7w Bf7Dy8NVt37FO5ZhjrPra9y01eut8zK+2+iTdAS+u/0KBPSKwYR7gz3ocp0Opxph0JbzgK/MyJ9I 1BaDXaiPUyXRiXse4FyrjvN/OqkigjtLf1YDLpNRFvCGpeGJi/Vkcu/WHZyHsnJTZVUCqpJmkX04 H/G7FTzata44oD4KMMwqNQ3CUIRjsEc1pHFzJ3yPNOsLN1JsW43sdYv4ini/SqzBU21ijtpJDvl5 KRTHvXKLEQdMUPfYWbWFSSShC/OcLD6p7h1VldKQnIU4ClF1/ysNqxlPe5fMHGjCjs/kyLFPPx/z i+9OsmME72r/v2p+I+SwjcxJv2+gwkPMUIpgnUb5r5zEvq/RlBmI6v9K+GJHis75itbXZ+UFXWIv 2WO7WnHHRuz/FsZMHncQ4LpvzMiaJSGH/FeXDFRbeNKSEEvecCPGNg7+5d2MR4FPqZeQgSnt/rNA Dq/x5KicrQDiHz4ugExQlfSW3JoHaO6K1e+dmVIHRISObdSmTFdA== X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Oct 2023 21:17:02 +0800 X-OQ-MSGID: <20231008131702.53228-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231008131702.53228-1-quinkblack@foxmail.com> References: <20231008131702.53228-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/zmbv: handle corrupted packet 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZzpTdwvt3VJT From: Zhao Zhili Mark the frame as corrupt when AV_CODEC_FLAG_OUTPUT_CORRUPT is set, drop the frame otherwise. --- libavcodec/zmbv.c | 26 ++++++++++++++++++++------ tests/ref/fate/zmbv-8bit | 1 - 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index d309a8612b..c7408f7af8 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -148,9 +148,11 @@ static int zmbv_decode_xor_8(ZmbvContext *c) output += c->width * c->bh; prev += c->width * c->bh; } - if (src - c->decomp_buf != c->decomp_len) + if (src - c->decomp_buf != c->decomp_len) { av_log(c->avctx, AV_LOG_ERROR, "Used %"PTRDIFF_SPECIFIER" of %i bytes\n", src-c->decomp_buf, c->decomp_len); + return AVERROR_INVALIDDATA; + } return 0; } @@ -224,9 +226,11 @@ static int zmbv_decode_xor_16(ZmbvContext *c) output += c->width * c->bh; prev += c->width * c->bh; } - if (src - c->decomp_buf != c->decomp_len) + if (src - c->decomp_buf != c->decomp_len) { av_log(c->avctx, AV_LOG_ERROR, "Used %"PTRDIFF_SPECIFIER" of %i bytes\n", src-c->decomp_buf, c->decomp_len); + return AVERROR_INVALIDDATA; + } return 0; } @@ -309,9 +313,11 @@ static int zmbv_decode_xor_24(ZmbvContext *c) output += stride * c->bh; prev += stride * c->bh; } - if (src - c->decomp_buf != c->decomp_len) + if (src - c->decomp_buf != c->decomp_len) { av_log(c->avctx, AV_LOG_ERROR, "Used %"PTRDIFF_SPECIFIER" of %i bytes\n", src-c->decomp_buf, c->decomp_len); + return AVERROR_INVALIDDATA; + } return 0; } #endif //ZMBV_ENABLE_24BPP @@ -386,9 +392,11 @@ static int zmbv_decode_xor_32(ZmbvContext *c) output += c->width * c->bh; prev += c->width * c->bh; } - if (src - c->decomp_buf != c->decomp_len) + if (src - c->decomp_buf != c->decomp_len) { av_log(c->avctx, AV_LOG_ERROR, "Used %"PTRDIFF_SPECIFIER" of %i bytes\n", src-c->decomp_buf, c->decomp_len); + return AVERROR_INVALIDDATA; + } return 0; } @@ -567,8 +575,14 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, frame->pict_type = AV_PICTURE_TYPE_P; if (c->decomp_len < 2LL * ((c->width + c->bw - 1) / c->bw) * ((c->height + c->bh - 1) / c->bh)) return AVERROR_INVALIDDATA; - if (c->decomp_len) - c->decode_xor(c); + if (c->decomp_len) { + if (c->decode_xor(c) < 0) { + if (avctx->flags & AV_CODEC_FLAG_OUTPUT_CORRUPT) + frame->flags |= AV_FRAME_FLAG_CORRUPT; + else + return buf_size; + } + } } /* update frames */ diff --git a/tests/ref/fate/zmbv-8bit b/tests/ref/fate/zmbv-8bit index 7c2fab691f..9a7c96cb32 100644 --- a/tests/ref/fate/zmbv-8bit +++ b/tests/ref/fate/zmbv-8bit @@ -278,4 +278,3 @@ 0, 272, 272, 1, 192000, 0xd08e49d1 0, 273, 273, 1, 192000, 0xd08e49d1 0, 274, 274, 1, 192000, 0xd08e49d1 -0, 275, 275, 1, 192000, 0x1f34135f