From patchwork Sun May 26 23:52:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49283 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2959057vqf; Sun, 26 May 2024 16:54:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVxsmxs7337UtlEdi1vswfD/cPiMZRX5bMhyL1q3zRfKcjMHtuOYtJqy/9XavjV1bUUzW+i9ak8axXoPYlP+EUSXLFHTH85BKqpZw== X-Google-Smtp-Source: AGHT+IF0kVZw1GuQPKiTV5mXWs5UuTuGyg/7L4K6pRkH9V7ZU9tPxTanh3Yj25Y2eQ8AT4p9w6Xo X-Received: by 2002:a17:906:f889:b0:a59:a9c0:57e6 with SMTP id a640c23a62f3a-a6265157bfamr754734566b.75.1716767694864; Sun, 26 May 2024 16:54:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716767694; cv=none; d=google.com; s=arc-20160816; b=zzNDgVqDUh1U5kE6jvY0eJVNhBGuTDHXcCg1LDtRmWBaW+GNNgWYSh/g8IVAu+R45E uOoxb7Pa5UvlvErBPaiLJbRAYwj/tVf1vrYsOXejHu1QJE0qe4mSbPly0gb/CX4tsCtr XLfJjJEYtjiFrlg2BV3wJBiW4AMvv2OVfDzTbo5mxfnL7HiK5BFqqMfrjJSdtSLTZmu+ AGurLu04/xvT4qmDjh5jrd/VtIZ3Bdl0I7BJ+gMrL58bbs6TT+siqHCnHwTcv2Z62ocE 22yLYQxDFFT2Qo70HwEoCJfQoLo/Y416Co40NgOQBQI8f3fy0GKiwl98Vx5gUA2zSv8T knhQ== 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=/B9RhQxe8MNEk8gXSFWFN4koorYW2gLN64kJnVaaxqE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=cIa+g5TcEAi7eo8nixvydgwaMfUSdB1UWPFyT8rfg1wsF8L5f3b81QcLq9dyZczG8Q vdJWvU9lIcUuP2If00mXWMXu9OuTKoVKIGSukMYh8cmGpbqelrb3LCrsyWy/FYcwRBqY yUaWqM/Kv8UUYONRGO+CuBIud3GM0UQopRpxyhNlV33sIt8wFvy9EbZrUZOS14XHsbGB NktTLpY7lU0kDbXNrYYhIFEjz+tEkuIIGrWP0yeinaVwZY61ZGaIJoRfMYjvuwYZeb2e nUFzpkeRExkZkRMCK3E98QDd49B2nzqmaCYITGP2XqoZq8+w/5zJcWZzhF8lEZFGUrIv TBQA==; 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=XaIR7jIU; 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-a626cd92c36si324005466b.801.2024.05.26.16.54.54; Sun, 26 May 2024 16:54:54 -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=XaIR7jIU; 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 8251468D5EE; Mon, 27 May 2024 02:52:58 +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 8813768D598 for ; Mon, 27 May 2024 02:52:40 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id BE8B540002 for ; Sun, 26 May 2024 23:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716767559; 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=AkdJhyXhu7loYsAHA4744wMfU4NbjuVsAAPtcaP1d4s=; b=XaIR7jIUIP3ySQo0bJNmgU7+9MCV6z3xm3X4rW/Zw+UHF7cyOWsZrUP7WZY3x3tiX4RRLs JbDoKUPcblrdUZDbNKLJXEfjvYceA9FuKbv5gdQjDvcA/pFjKAdjqPURf5MlQA7ksON9jr r3AOvmyJ+MPoYPxl8iCLKyfSIdsMLo96put5Ve13uOOLN7724TyWDQIzKQfWC7lG8NwAYT w1hNWaOGWF1sSEeYwgh38LKNk/uNbj65I9rSkY4cfGJ7h0EXwqQHr9SjNOeWqN74FMIaJi OsBilfZEifOXlZg/q7ON51q9Ktrx1uptP+ugKLc9hW71GeMd0Ixz31O0wctbug== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 May 2024 01:52:22 +0200 Message-ID: <20240526235230.2876318-10-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240526235230.2876318-1-michael@niedermayer.cc> References: <20240526235230.2876318-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 10/17] avdevice/dshow: Remove NULL check on pin 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: DZUW/SFmxMyO The pointer is used before the check Fixes: CID1591884 Dereference before null check Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavdevice/dshow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 0330d1d0b6c..8942c0c499a 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -432,8 +432,8 @@ dshow_get_device_media_types(AVFormatContext *avctx, enum dshowDeviceType devtyp IEnumMediaTypes_Release(types); if (p) IKsPropertySet_Release(p); - if (pin) - IPin_Release(pin); + + IPin_Release(pin); } IEnumPins_Release(pins);