From patchwork Fri Mar 3 12:47:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jackarain X-Patchwork-Id: 40573 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp703086pzb; Fri, 3 Mar 2023 04:48:20 -0800 (PST) X-Google-Smtp-Source: AK7set8Oyalpn3zkv3MUI+cK8tZeRMBzq06V64MArsFftsi/O6t42hdvNRRFkRrMVhRb970MWbHP X-Received: by 2002:a17:907:7fa0:b0:878:6b39:6d2a with SMTP id qk32-20020a1709077fa000b008786b396d2amr2038653ejc.46.1677847700133; Fri, 03 Mar 2023 04:48:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677847700; cv=none; d=google.com; s=arc-20160816; b=qcuZ6wyqaLiv8jNxLaVanj13/iCoXwT0yVRzFwXJ2FpQ5ak3u/7VT14/qw0aOI9PmG EOYVGgloK9nrSHsy7uRz0MVBeETLRyxCJGZkVFrZuPqZYspQ6Jcnyu/vvV+aMOFrkEK/ ns7ik0PR6bBUbkiJOp1DsliPYkHFX3F/xMge0q2Y0VA8nRei8lnA80eA241DwqWLss2u RNk9xT5hUBUkAWAotAZtwxR1Cbnb5/jWJ77ay+DUlQ+toFPmD4sYfP71plvY8j9fMICk V8laMpdzYrYIutazPPKS7beEIdvAqw3hwj9Cg7C8EV28E6xVVYW8Al3WjYHDIHF1ULk6 H7fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=wDHWmWHyQksNEE19ZoZ3Svi06eVyu8cI9GmyfQ+p+Oo=; b=XNMWtXTO4jqn5IkJTBdm+713JvY8TBmJQKKmPr6F2MoRXtUhFaCWi1hMi4MWa+Ow0R PwDVGdUPw0Ty0/q5Cezit2tYKBT0MFpbkVG1H0QZPSofMatzr+dMGXonFt99jQ7BE93V 9WxeLHSIbrUQomNPFM1f0vIlyvAJ4hiDN8UHdStjnc4Vv0DskyRwMGDQm7OFCfoY58zH rG16a37UQ9KYu9zanOhlv/ImUg+BFqtCmlfDAT+pCcjYuPVjzfk82ga3/Z8xSBNLdsQ+ SH2RV1srH8RIXVFS3rfGsVRS2dFtQummalbmGs0p5IwsVv2qgjMkYwPUPFloYj/0QL+X +xhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZDAI0BDc; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f9-20020a50ee89000000b004acc45a0577si2544065edr.277.2023.03.03.04.48.19; Fri, 03 Mar 2023 04:48:20 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=ZDAI0BDc; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8921068BA08; Fri, 3 Mar 2023 14:48:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1787F68A861 for ; Fri, 3 Mar 2023 14:48:10 +0200 (EET) Received: by mail-pl1-f181.google.com with SMTP id p20so2490929plw.13 for ; Fri, 03 Mar 2023 04:48:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677847688; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n94NFchXpad4B9/BHYC3oD9rs5oEmTzC8pAH8ZG2rfo=; b=ZDAI0BDc7DJRq29qUtHtDlqeSGeQ8v/u9pggm8cW64ydeI7W1pwyyZG+n0M2IvzY4E /DOZyMbmptTlSCX3TkHUcgOJip5SmxcPM1M9+rB2U4+v/dD0OFujL1mdTNqGClW9qngp kIBdZ7n1KXFdYG3W6eMoo/bBYyjRf6rDAQ3DJEaVGy0hUj6lwSkQL4B73uL90ZgX3Qon QdvLwd/bPJB1SDtzdC4OmJOHR5fRhDJcTNbMCZL8HVEuZ1KVV/pG577jVA1uSg8qlvVo woV0Vgpfpl1yZEgCYYng+nGF97qX5hXzslbH6SN5UyOyDjonH7/C5ljz8ZTU3ocYzbvD 5hbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677847688; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=n94NFchXpad4B9/BHYC3oD9rs5oEmTzC8pAH8ZG2rfo=; b=wxBZyrMPHUeoiXPCz/9i72bbn1U/hgCfAYhELw9aNKZZk/oj68T/cNlE0C/Dn90htp oq1C9fUMby1q5S6962sdTyCxbXM3RGhb9yD62yHse6SZNP0ACdD0j3/Bqs3t3NTDJx2Z 0Wib1pRL318EdhKzw+gUn+wWeM9zrnrfYiDxbZGS7B6NxBVC25a9U3CnQCI/7qUk7Ena p82C+nadhtC1YlYKzBNK/K6CMFzjPm7vg2lPmDpL8Dwmb+W2PWpdjUW4yk6PHSLPA4ZC 3eRKJWw1rvTXLipPYM+nCDt8t5UJ9cQQit9Lqmz7hX+/qGdh2N6bsOPsHeLv0V8nLdty XR7g== X-Gm-Message-State: AO0yUKUvI5KPPMsR1B9cG6T9Ro/GmlQOoh04L3GsxZnJUF+9BnjowZuU IWEYG2CGQaflv9xgunOXT6QVurftaXqsXeBR0FE= X-Received: by 2002:a17:90b:1d88:b0:237:99b8:4eef with SMTP id pf8-20020a17090b1d8800b0023799b84eefmr1715952pjb.9.1677847687755; Fri, 03 Mar 2023 04:48:07 -0800 (PST) Received: from localhost.localdomain ([2409:8a28:5083:e220::51b]) by smtp.gmail.com with ESMTPSA id y14-20020a655b4e000000b0049f5da82b12sm1458048pgr.93.2023.03.03.04.48.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 04:48:07 -0800 (PST) From: jackarain To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Mar 2023 20:47:59 +0800 Message-Id: <20230303124759.1140538-1-jack.wgm@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavforamt/tls: Memory allocation failure check 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 Cc: jackarain Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ErqwxxARH40O Signed-off-by: jackarain --- libavformat/tls.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/libavformat/tls.c b/libavformat/tls.c index e42d399862..b9d3426331 100644 --- a/libavformat/tls.c +++ b/libavformat/tls.c @@ -30,15 +30,18 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" -static void set_options(TLSShared *c, const char *uri) +static int set_options(TLSShared *c, const char *uri) { char buf[1024]; const char *p = strchr(uri, '?'); if (!p) - return; + return 0; - if (!c->ca_file && av_find_info_tag(buf, sizeof(buf), "cafile", p)) + if (!c->ca_file && av_find_info_tag(buf, sizeof(buf), "cafile", p)) { c->ca_file = av_strdup(buf); + if (!c->ca_file) + return AVERROR(ENOMEM); + } if (!c->verify && av_find_info_tag(buf, sizeof(buf), "verify", p)) { char *endptr = NULL; @@ -47,11 +50,19 @@ static void set_options(TLSShared *c, const char *uri) c->verify = 1; } - if (!c->cert_file && av_find_info_tag(buf, sizeof(buf), "cert", p)) + if (!c->cert_file && av_find_info_tag(buf, sizeof(buf), "cert", p)) { c->cert_file = av_strdup(buf); + if (!c->cert_file) + return AVERROR(ENOMEM); + } - if (!c->key_file && av_find_info_tag(buf, sizeof(buf), "key", p)) + if (!c->key_file && av_find_info_tag(buf, sizeof(buf), "key", p)) { c->key_file = av_strdup(buf); + if (!c->key_file) + return AVERROR(ENOMEM); + } + + return 0; } int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options) @@ -63,8 +74,11 @@ int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AV const char *proxy_path; char *env_http_proxy, *env_no_proxy; int use_proxy; + int ret; - set_options(c, uri); + ret = set_options(c, uri); + if (ret) + return ret; if (c->listen) snprintf(opts, sizeof(opts), "?listen=1");