From patchwork Sun May 26 23:52:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49290 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2958975vqf; Sun, 26 May 2024 16:54:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUo1sKZPGsJmKGbgpMMz39neWDCnHnAJlX7cmu4kJoZ13Mtgd9pyMuMEpPvuZGuIY+kcjn4AqrfN6BQoBbNlyC39DjmvIy/v0lGtg== X-Google-Smtp-Source: AGHT+IHjB3H3b2RMSY5s2BtVvCFD/95FVcWl3HN2RXGyqlCzzRpXRnapmxBDSioPNB+1VtMi/APV X-Received: by 2002:a17:906:5654:b0:a61:9d64:e79d with SMTP id a640c23a62f3a-a62642decf2mr610819266b.36.1716767678405; Sun, 26 May 2024 16:54:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716767678; cv=none; d=google.com; s=arc-20160816; b=YhAiX/D9LBV6Xjp2JDroslhIvtsFXDgtSjxM0EjyqIFU1LLHEXrrZHob3PrATKgCvP TJP7J7aaiOWFJ/yO+zwHk0wTKIs9cSdwTtw4Sgkt/wsrfCXbZBoOTrRJIeNGAaF2iNFb Dn79JXpluSvumSxDFGNtUyGKBuYxXUKj5yKPnkevgDn/tvKJJVc2TkDDNkcZb37Iap01 mggVjpFGG3fpe28twdhftMM3EHQQhNvOGR6J5slxFFKLjH210AWXduKIZDNILs6vwHeI 5wVywhPu2EblLaFpm8fXsI1LGUBihLFT1h+6znDvIegJGL35vA6goRcj8/lWwBM//7PC uACg== 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=0HfyjAxTLSy8vCQOycquEScrYmgLqiFt7EqyksSJ0Kw=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=wht9yDoYCm+y5BdTkic0kX4giQZB71v+VRCoOOj3qO7kc7hq3vD4absjX4lE0Zbbcb Pyp0Hx0R6SRu31Txc/sANfxaAUMO8GOMRA6lYG5zDIaONDJeJrSMaAcfG3oOwyqjsIl0 lUnIxoSEDlFyyHNkbQQ2MJYv2IA2cm7EuUVOifmhwj1LjZ189uTWvQG2TLYX0vci+Z7D /8ESYUWwxPVRdYYRbcl1kx1zw8a4/JC1OGTod1aweyzlGckI3QyDIk8BS+kvdPPnMaKJ RKuWs7bHwomrUwVpSDdXwCJ5dejMHkPA2RRITXKSaGCtIRpj1z0dLWYmmEYr+B+EyIU/ BydA==; 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=pDaVuZ2A; 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-a626c800e2fsi327190566b.87.2024.05.26.16.54.38; Sun, 26 May 2024 16:54:38 -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=pDaVuZ2A; 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 C97D268D5C0; Mon, 27 May 2024 02:52:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACBF968D590 for ; Mon, 27 May 2024 02:52:44 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E5A391BF204 for ; Sun, 26 May 2024 23:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716767564; 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=dgVhXFpcn4upS6Ofev6q1EsxPrPfFy5nzDjPKntVbG0=; b=pDaVuZ2AtY8r7/4ix8dB0ouEg3JYKJP8dIfHwOH0+G5ZGk09oKfr6u6bk6hHYdoogodsVY DBCj4InEHWcRhdrbysmxaKzpmbtr5b5N3uvc2bDT/STvxEjWXcnghqBEtX3jAN8Z3qbt60 OgvPf2V0tuQs75GvtlMtl+zHZA4uIkjMrGDuz7G7uuRrs6d84apv6x7Ql9aaE7F3JJnZvk pDaikX2+6vkm47XA80XdTKfFz8wXtHptr0Ga14yspvWKKc+5+ZQecxlBhuB4+ULv9Pz7jF NFF7TFUBdeispeFL/FqQSliPcmaK2wNWuK5ZQ3l1oxwXqhbpZ2sHWL80jZt0SQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 May 2024 01:52:27 +0200 Message-ID: <20240526235230.2876318-15-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 15/17] avdevice/dshow: check ff_dshow_pin_ConnectionMediaType() 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: L+bF3PBe14+y Maybe Fixes: CID1598557 Explicit null dereferenced Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavdevice/dshow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 645c33ea2e6..403e56fe135 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -1546,7 +1546,10 @@ dshow_add_device(AVFormatContext *avctx, ctx->capture_filter[devtype]->stream_index = st->index; - ff_dshow_pin_ConnectionMediaType(ctx->capture_pin[devtype], &type); + if (ff_dshow_pin_ConnectionMediaType(ctx->capture_pin[devtype], &type) != S_OK) { + ret = AVERROR(EIO); + goto error; + } fmt_info = dshow_get_format_info(&type); if (!fmt_info) { ret = AVERROR(EIO);