From patchwork Wed Jan 11 20:42:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39976 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp5038009pzb; Wed, 11 Jan 2023 12:43:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXuOL1/6/IV3f7gFi5wVpq5zB6VvvJ3GEXwHQ4paUohAFKjHkkekU+R1q8Wfl5UKs9ZjibVq X-Received: by 2002:a17:907:b601:b0:838:9c66:cd30 with SMTP id vl1-20020a170907b60100b008389c66cd30mr65712304ejc.13.1673469782457; Wed, 11 Jan 2023 12:43:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673469782; cv=none; d=google.com; s=arc-20160816; b=ufkkPzjpKyLQ4v3J8zkE3qWmZnPvmvw6ZL0vUTJ/X5vEFmCLw5JoFI1OTyAQCuNhY3 GfgIWCcyzZgDVdV1KEoyfPRaW23neAUFeP/XZXi3Q0EzHGeap3pbxdpcUrvs6S251VqC IrweUE4ksW1rI53SGtQV2bOuEaWrq9PA35Z7awFyc7mTYWjeRcWcPs+F8zPy9bdUuQ5h tCBhzUjCxZzGmR0YatxxpAkrWya1WqQ/j2bbqKqKNZEPy4jgQKK0SgSRgIhYxSq3YPb0 efV2U6U9ZqGAHnTlK/A/EyOyNZaVW++ItUB4ncSuo5PaZbIehCETokKuLuF+sVwXzl7/ fJ1w== 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=TiYKuzq+oHjMgGWO+TXgsCbnB3QmtTJWKcfPH003rcM=; b=G/qK520unDcf4pq3fC6aUPmygNeg63hi28yPOAUV7L2VO9gr0RltaPrCq6AsHSrHr6 VJtN5siOQXaJao86ycBtnEsYXso4meQ42rauKKJonYt25/BMHN/54zuKLzWazsGRN3QR 1reyfBes+Pzsq368Rm41jY0aiEVekJFY9eivf4VNABva3u14Y/ZsEar4dP3dDykOArdt S4yDSUVFKeOUCffb08z9QPQcPXmso+9WLfbrbBJlymK6vqjxeGAzhpDFA3g29n3RQakx iclSL3pXKE0wjYnqLFn4Q1p7zvtQaQ11QhT/XKPfqCD5vgXJSUkEChJnHyfD9OHBPkxa PwIg== 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 dr5-20020a170907720500b008327270a7ffsi16274531ejc.663.2023.01.11.12.43.01; Wed, 11 Jan 2023 12:43:02 -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 87FF168BD72; Wed, 11 Jan 2023 22:42:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89AC368BD5E for ; Wed, 11 Jan 2023 22:42:34 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 88554240005 for ; Wed, 11 Jan 2023 20:42:33 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Jan 2023 21:42:19 +0100 Message-Id: <20230111204221.22550-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230111204221.22550-1-michael@niedermayer.cc> References: <20230111204221.22550-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/bink: Avoid undefined out of array end pointers in binkb_decode_plane() 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: ehk1dOcQMd3f Signed-off-by: Michael Niedermayer --- libavcodec/bink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index a3140114f0..15fc9d29ed 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -870,7 +870,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, binkb_init_bundles(c); ref_start = frame->data[plane_idx]; - ref_end = frame->data[plane_idx] + (bh * frame->linesize[plane_idx] + bw - 1) * 8; + ref_end = frame->data[plane_idx] + ((bh - 1) * frame->linesize[plane_idx] + bw - 1) * 8; for (i = 0; i < 64; i++) coordmap[i] = (i & 7) + (i >> 3) * stride; @@ -926,7 +926,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, xoff = binkb_get_value(c, BINKB_SRC_X_OFF); yoff = binkb_get_value(c, BINKB_SRC_Y_OFF) + ybias; ref = dst + xoff + yoff * stride; - if (ref < ref_start || ref + 8*stride > ref_end) { + if (ref < ref_start || ref > ref_end) { av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); } else if (ref + 8*stride < dst || ref >= dst + 8*stride) { c->put_pixels_tab(dst, ref, stride, 8); @@ -942,7 +942,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, xoff = binkb_get_value(c, BINKB_SRC_X_OFF); yoff = binkb_get_value(c, BINKB_SRC_Y_OFF) + ybias; ref = dst + xoff + yoff * stride; - if (ref < ref_start || ref + 8 * stride > ref_end) { + if (ref < ref_start || ref > ref_end) { av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); } else if (ref + 8*stride < dst || ref >= dst + 8*stride) { c->put_pixels_tab(dst, ref, stride, 8); @@ -974,7 +974,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, xoff = binkb_get_value(c, BINKB_SRC_X_OFF); yoff = binkb_get_value(c, BINKB_SRC_Y_OFF) + ybias; ref = dst + xoff + yoff * stride; - if (ref < ref_start || ref + 8 * stride > ref_end) { + if (ref < ref_start || ref > ref_end) { av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n"); } else if (ref + 8*stride < dst || ref >= dst + 8*stride) { c->put_pixels_tab(dst, ref, stride, 8);