From patchwork Sun Jul 7 18:47:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50390 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5405932vqv; Sun, 7 Jul 2024 11:47:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVCVx3jmF+bwRO5vkgPs87m9GABNNs7W7cppm0TVnQMXRD1HZgaPYKAPBrMZ55EB8a44zmCz95VEghyVV39ir6uyNcoTvaL3Gy5ow== X-Google-Smtp-Source: AGHT+IFfupdW+Kqe5rO4Pyijr310QJCz3IOYCk2WF52r/HprFfAb9yDf2fpXcUEM8KL+m6oUDwL1 X-Received: by 2002:a05:651c:990:b0:2ec:5172:dbc4 with SMTP id 38308e7fff4ca-2ee8ed8b7efmr76543161fa.12.1720378073973; Sun, 07 Jul 2024 11:47:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720378073; cv=none; d=google.com; s=arc-20160816; b=YOV0ghh7St3xhV1gMYME8BVJjcREHlXFGgQbyUR0NNvTByoztKlQ1pA4H9r471No+v syxE1yQ2FLg5QqJbUOt5Kv0BSOW80hPjpDpbNCRrn1xuUviD3UjyKqJoexVJfVcCk4jo HQ8W+/Yfj59NzvY9XL1AxvnqgKIHp4znFTkjcZthZugiQVaM7JXFJGKDQw43XHgu43hO CP4cEQfnmXKxxsc1hViksHAsNhGpN3l/fovrouHFa+W/JyLaGSwfIuc5nDbmzNJtjV4Q LL8WM6Sl27XdBkZi4qu9pswFRAw5y2wvsk5NiLRpSFYMhgHhGS9UtKbrvF0KjQkA3P6E p0Ag== 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=cHfpSye4oqBG6Fi7iO94/+H4wKpnR7gnJ3Su6sv+lC4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=I9SXL1+/ZkqAeV8TNDpz0Hefp7C29wdAjWaoToNIsc2SpkZj1gJxJpHJATisI+GMyg eMd4TaBhjBebT218qp92XGjSFKN8GxSwr1baT+VwMwG5zaHAmRpFzJ8ZuM5CmeBXK870 lnsd7m72z7xIlBScuz9l82KkBrbcdBfyxUpuVWaRoFQUvfeLFDL4K9OiDUcKgg5+n2+f gaYU/QRcaWHR0m8DMZtihH4zDxmLDxvPuya4B2Xz0O/ARQF8NL5NWvGwwX3FQy8juaFw NdTWfcO1CBw24UQS+hw2fWW+1szd6KumYgfbpc1MORsfQiCCztK8q0RJNFDn3MZKOMCf hC8Q==; 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=nFFc7DLN; 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 4fb4d7f45d1cf-58d47f7dfeesi5252233a12.274.2024.07.07.11.47.53; Sun, 07 Jul 2024 11:47:53 -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=nFFc7DLN; 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 32A1C68DB95; Sun, 7 Jul 2024 21:47:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C15C68DA53 for ; Sun, 7 Jul 2024 21:47:32 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 7D47BE0002 for ; Sun, 7 Jul 2024 18:47:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720378051; 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=XG43tCmaKxmkZNYKh/ZQyQi+qieB94EfgqemmbUDMQA=; b=nFFc7DLNIyITkg/zPiRCqH1hk+n/GTONMR83rHFVcR+s1yCIXH/P2UIDh7cNOIJH5UINJv /++f3AfqdqZ4c7W826MHeRC5LNX0eN+uzpd09B2k2KGmy6u7Mu8JWAHPdpTQmOoUQP5Cas qpLSrcbE1IPoV4Yh+WpyqmW35qW+UT9dB+an3dVxgduEqT0RdzslrEqREvPolQ4IY6Eq1L 9Lznljq6FVUEeWWr9xvHCh8J69YQd3iJQ0K+qp/e1xl2PLVH5Mz2xCajjsJKCb8YM0VUOF n2cv3mhka67JmksU7DZr22d7VoeWH4z0BXelRFUoEZ4BwAa+fAaL3nEa1YUMiw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 7 Jul 2024 20:47:25 +0200 Message-ID: <20240707184729.3525852-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240707184729.3525852-1-michael@niedermayer.cc> References: <20240707184729.3525852-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/vaapi_h264: Do not store our error code in VASliceParameterBufferH264 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: aLc0F6qSOlg/ I am not sure this is possible (thus this requires review) Fixes: CID1604570 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/vaapi_h264.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 398e92568c2..77819a64a4e 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -342,6 +342,10 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, const H264SliceContext *sl = &h->slice_ctx[0]; VASliceParameterBufferH264 slice_param; int err; + int slice_type = ff_h264_get_slice_type(sl); + + if (slice_type < 0) + return slice_type; slice_param = (VASliceParameterBufferH264) { .slice_data_size = size, @@ -349,7 +353,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, .slice_data_flag = VA_SLICE_DATA_FLAG_ALL, .slice_data_bit_offset = get_bits_count(&sl->gb), .first_mb_in_slice = (sl->mb_y >> FIELD_OR_MBAFF_PICTURE(h)) * h->mb_width + sl->mb_x, - .slice_type = ff_h264_get_slice_type(sl), + .slice_type = slice_type, .direct_spatial_mv_pred_flag = sl->slice_type == AV_PICTURE_TYPE_B ? sl->direct_spatial_mv_pred : 0, .num_ref_idx_l0_active_minus1 = sl->list_count > 0 ? sl->ref_count[0] - 1 : 0, .num_ref_idx_l1_active_minus1 = sl->list_count > 1 ? sl->ref_count[1] - 1 : 0,