From patchwork Sun May 19 02:49:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49002 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3719608pzb; Sat, 18 May 2024 19:50:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW+VvnD9mrWzzJa3Ly+0KQf3GEdAwxCY/fyrEAEEhYdVl7VzqazZIGD6vC8eHxpE4MpVzB5i3uz1/suBcDtRPo3z3T3dbkkBp70bw== X-Google-Smtp-Source: AGHT+IEBUEaBCg4wl8X+PakFd0Wofj4K52+D8Ylgfjb8M1tGpkdz2tdfZY1sgoOlFDRZ0Q3YcDqR X-Received: by 2002:a05:6512:1305:b0:51f:452f:927b with SMTP id 2adb3069b0e04-52210070208mr19975980e87.45.1716087017365; Sat, 18 May 2024 19:50:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716087017; cv=none; d=google.com; s=arc-20160816; b=XkCQTacv3aJhtJ/x3njpKXDiR3EZa9tX4KGOV8yVyG7wmVr1/nIdTRhsFGxN3NfkaB iZ8b6zGZ4Oa1F6syfFBSIneMYGl359jsgPb2Kv0uJOF0CmEwVtIP5jcpgxUomXZQXwm/ L/FJvakj3BR5ep2DpvJXi4wAbsj5hSkY0Mvhk0WGmb6eqva6Gm2Y3r9LBmbS0udaYFq4 D0tzQlQw6nlRs/zH+J/GnIhRcdTuEXvdrNH1N+X5kDaYn0KavzLbw0RcAoDrnkJJdvGk mzvcQkzSyWEj5ex6Vzuxhq9WZy2VwqLwVO6AVLOvkOQcQ9F4qNOnm6P91aSOct8Lp96T L0Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=6nTH7XwzidfYzv2MpVb72P+u8sSoJWZZ57f0bE4Qs4k=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=i2jMg8IJ/1hO5cHV6GNKZ24D7xjxTzw0a3ImPH1KuFQAe+jIwN5WYS28cdMLtik14y M+KkpLTAOvBBSwYL8lEDSEQqayB4I7MPVlxh1G6JsoOC7pdiuAXFj38A+xa0iHLWTq98 aOW25JWmYCb4QoctfW1W1mj1fqq4zpAX6e/mATP5qsMIZ2SmxdE1FaiMswLYPnbO2Fd/ LZoHrMEZciFKTXr8paulcG2w6MVKjVoYVNIUyS+sAzFSXwZBCNPglA87Ljp+3PstzvOm PwCdy2sAZNbCJ8MKYtTVwlbXbJ768/pjqH5aIuh5VUveLuFm1U4FCpOJ8+QYvXW0dSUV 3qGA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="L9vv/w/Y"; 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 a640c23a62f3a-a5a17ba2accsi1169467666b.524.2024.05.18.19.50.16; Sat, 18 May 2024 19:50:17 -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=@niedermayer.cc header.s=gm1 header.b="L9vv/w/Y"; 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 96C8C68D22E; Sun, 19 May 2024 05:49:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D778B68D239 for ; Sun, 19 May 2024 05:49:23 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 1E5EE40002 for ; Sun, 19 May 2024 02:49:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716086963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CbpfJ+OCprBfLE3cAcU4A0tXPmGuC8aNJIdXEBcZFRo=; b=L9vv/w/YN8lRHzFP4hj6oDo+NEJfhgaOrDgFCbWHSS0lxJCgrFAIzWMNE9qj3LJpO0Q0ju PVfpvncuvy92I4Da9Q9Xg64GJM4fBtDeIuUXCgoZdotf/oYbAbaeIq1N8SEq9Nr0myEOco 1ueXnTJS03ubMGsybuR8VY78+DWCvkpuNQ7VrzJwiZJozChvSyHovqdVCtyy4pQo8WCm8a JG55bEfedutYWyUpcmsuTlpdm+UoN3rwr6gklQ+RGHPDZPHyX/t6YUhkiH7tUxiyuU+Vud 6IeudURet7UgDYy6SZjs/vXRj3scxm7g9vW6ijOCkEKkUZFFoG7snh+coa9zUQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 May 2024 04:49:12 +0200 Message-ID: <20240519024915.1944150-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240519024915.1944150-1-michael@niedermayer.cc> References: <20240519024915.1944150-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/vvc/dec: Check init_get_bits8() for failure 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 63JS/F8AREP/ Fixes: CID1560042 Unchecked return value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/vvc/dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index d262d310125..f2ede490c8b 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -514,6 +514,7 @@ static int slice_init_entry_points(SliceContext *sc, int nb_eps = sh->r->num_entry_points + 1; int ctu_addr = 0; GetBitContext gb; + int ret; if (sc->nb_eps != nb_eps) { eps_free(sc); @@ -523,7 +524,9 @@ static int slice_init_entry_points(SliceContext *sc, sc->nb_eps = nb_eps; } - init_get_bits8(&gb, slice->data, slice->data_size); + ret = init_get_bits8(&gb, slice->data, slice->data_size); + if (ret < 0) + return ret; for (int i = 0; i < sc->nb_eps; i++) { EntryPoint *ep = sc->eps + i;