From patchwork Sun May 26 23:52:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49275 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2958534vqf; Sun, 26 May 2024 16:52:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVfXzdNnGbSIqQZKCz08IulSlCgEVpY+3ybINQf99pWxj7R7tpq/0nBQyOwd018L74T1H7Rc63fAI5Z6kivE+Y32RogoYermR7hHg== X-Google-Smtp-Source: AGHT+IHwF+d6uxoldl4RVzzo/Kdlh4uAmANQThYeaOCxwBlSLaAPokZFdTM4kEC17iWEkxeuAmBL X-Received: by 2002:a50:d4d8:0:b0:578:5fc9:c35e with SMTP id 4fb4d7f45d1cf-5785fc9c592mr4882904a12.2.1716767564658; Sun, 26 May 2024 16:52:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716767564; cv=none; d=google.com; s=arc-20160816; b=ECgmzKIYhoJTiYq0u7QYP5N5ZVAiCZ8vPHL8tiSIbd7kBNjBd0qQqau3l3tz7S6N6P nPFtbV9mZa+fF4v28A0tH+gi5f3NwtpAIAeWcPGk1hhdoE0tNREsXGUOa7ZSD0Vkp+Y/ UApcQSRLn2TI3lTqIHkNKHhJi13JD42C9WhDT+ZmQHe4989pmzDL6x62XCNVcxdPe7TW hJdUvxfuGLPMTcBaBsED5RFqJ/KW7GcL1cTEXJCR4jdNeWFUOnPKb6Fla7LfmDtdEEwV rMS+GKGGpH1zYxBmbNgduUXZeh1Z7qqX5gKBFLlwWQtiwicLTYUM1hxzLQ8kWhls5MmY MYcw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=aJcobF8SH5nM3/dvs4OnT9bLi+ePDWw5RfFkYtRGy6E=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=BViKxQoCNyzqzqQLnmUHhvUO/tuWDEtR79FbkIbTF2GXKIvIBp2wVsbZ7kJqqfs/te 0ZSPGTRQfoBH3ZvrNcthwWyJ38HYwqsK5qONVloas47NlNsMvYD7NNk3edP2j3vr4ojx TPMm83zcplzCSL0+lAw0Xfy2mXyHFcUuOhG2lSJ4xG/tGeZLMHxU3dtLuc/ztl5go/uo XzHQ0zXhqYr5QzNkD63SSbA5Y5lcFycg3whw8xurkpIIRzZItriuaXWFmhNk/VtzL195 5wX0fG5kC0d8PypYupgY9pCKycTXoLSlBbfOBd8Z7pirzG9xhQtVJ2wnFXEjw6iDe04E t12g==; 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=XFRkxVaD; 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-579c0082468si1843893a12.355.2024.05.26.16.52.43; Sun, 26 May 2024 16:52:44 -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=XFRkxVaD; 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 7D39C68CD10; Mon, 27 May 2024 02:52:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F94C68D01E for ; Mon, 27 May 2024 02:52:31 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id ED286240003 for ; Sun, 26 May 2024 23:52:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716767551; 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; bh=2Rq4W2swGFaUtwaDgibaJYJ9cYtDdKlHrL59N9cNzQo=; b=XFRkxVaDV4lJ2kXN61im7QgiAxR7IC1kWoOFayEMBhLYwtdyzoiZRgLfy+8tQzoH37Oee6 ZKNYrERGmWPsJy1t8eFuVMPVf/tCkT+AoYmkOyIdr+XErgt/qA8RYt7H1ccWaS4L5O+Znq pzec8sAkASGhjRDOpuH7XuXitBuusUxxCpWBOv+VMwP567PCIHy6TMHLKYukbiHtv96QD1 ALnmzU4FkgCodBUqsu0CO7iwzJXWFzgAJR0ipJEjQQ04JI6UrGTcPcIyranaAQlCa/kFLV Hfjf4DJ4C2xLf5B3z3NU++/52zBpXUR7nU+RIkEK2tZiuBGpEXG17eAzogsYuw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 May 2024 01:52:13 +0200 Message-ID: <20240526235230.2876318-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 01/17] avcodec/dxva2: Initialize dxva_size and check it 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: jBoP2L/vv+mO Fixes: CID1591878 Uninitialized scalar variable Fixes: CID1591928 Uninitialized pointer read Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/dxva2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 6eb66c02e40..75ca84d0fe0 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -806,7 +806,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, unsigned type, const void *data, unsigned size, unsigned mb_count) { - void *dxva_data; + void *dxva_data = NULL; unsigned dxva_size; int result; HRESULT hr = 0; @@ -828,7 +828,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, type, (unsigned)hr); return -1; } - if (size <= dxva_size) { + if (dxva_data && size <= dxva_size) { memcpy(dxva_data, data, size); #if CONFIG_D3D11VA