From patchwork Fri Jan 12 18:16:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 7266 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp2294113jaa; Fri, 12 Jan 2018 10:23:30 -0800 (PST) X-Google-Smtp-Source: ACJfBovJRzSAieP6aF245AqCeccxg986jdgdo9NcCa0oUBf00jmanwbY5qdgX03IhvzQ4O9iSs29 X-Received: by 10.28.105.214 with SMTP id z83mr5033035wmh.77.1515781410160; Fri, 12 Jan 2018 10:23:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515781410; cv=none; d=google.com; s=arc-20160816; b=nB3kB02CToXgmln276XFQUnucXy6TEWih48B6FqrQpsSgLH64njaWGmP5ZB6CZXgVx 2LCS4bFfmxrxugDeP7CBzSLTg6IMV7hA7z2QccGCb21ZmDjTObqWnrRcxEeOP0oX6Sla rwF6JCo1s0i95Zq4fWfRpbILT7e8zM+NMb5NXSE93+fKTjwmw5wLlyFae+uX9lsQVXQ7 ykC4w8hp2FjrktvkbCAxLYjr8jzrbQjvqcppnM7j0kREvrX8zwpqDz4ATEygRGK/JIKt ccnsidjQpObtOGvA6vN+70nbv//5t9/rqbA/NprFBIhNuTSEZw9fEC4xsFS9wds9d7Eu ELHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=nKRKchBWByGrVf2LpxqRhqBFTygzJtOX1YiKlJ02N0E=; b=SsFkuBCqSlRj6lxODeviyUYmzRFxnJNGw7rkU97lSI6cdgJWsQ/1k11JQA8TOQ1MvU 9YSMqKNquJczivrDRdzjvIFOqNwVxFCej5hoEsuewLQ+JcEBrAf+0yB7UnW1Y8D+Yizj 3EGyKGQQC76LGlzB2V/8+mifnyPSxV+XFDVAJ1kGX2q/c1DzZwRZCh3PPoXtJbV3z/AF 5Ll4uSmnGWh0BKZD/Yv4PqkT5sV/KbkDSwI3/nj+XwoXBphdxeub9Kv1NZobOm6tuSyd 5FMI5VSNSCcdU5GDzBjla0VNVDC3N/lIzjnNWKyJhlTlj9pxhxpxjyKKXmBKo3M6GeGg lf0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=ksRM/b2/; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 71si2569758wma.109.2018.01.12.10.23.29; Fri, 12 Jan 2018 10:23:30 -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=@googlemail.com header.s=20161025 header.b=ksRM/b2/; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CA9068A26F; Fri, 12 Jan 2018 20:23:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BDAC68A256 for ; Fri, 12 Jan 2018 20:23:21 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id b76so13637855wmg.1 for ; Fri, 12 Jan 2018 10:23:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r1CansF3AFr468ggmKC0R20B/yVIe1TguJ86Owa/7zs=; b=ksRM/b2/ROV4QVUyTPxiWP9ingzrmMfi3Ll/TwUaR8dN5ZxN5hxALpEjHSVDl7ggo5 PJTIyEJtgzt+lQiIvasI8ueeAOWqo5m+rl2ZLPIy752Zp6pKr5JXi53sZJydeqMt/2xh joUbSC/IDgHYQ4ZrLQKsOtueh4ptyurqO5MKhQ/M6gjMlFx2f9ovYbJbO6wjoZGhS/S1 if8sm/YeXMzyoCmxA1kHoX4nqTl0ui8r6yUFx4Q3edMyL1x0iNHx4Es64fW8mp+mFwCk ZPHlzNeWWkKJeUxdeRwnnsoS344U4RNy1XWxorvXGtDkSMVNBxdjpC2IQDJNRP8/8n7E GeGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r1CansF3AFr468ggmKC0R20B/yVIe1TguJ86Owa/7zs=; b=h1Axr0qO54df6+grORBXd2QhROdFujXWNtM8zQuwEF/M+yK22mQIpaqFZ461iSs6Mb hQx+K0PdYvqYzFlWF3t/MvEvyf2goCTTfJy/yVbrTPAEJjPhtBrq/Rk8BidXTVwOgBia FU4uvWFbhJ1OhvbVZLvm8uZSSPb083TsJxDl0ixpktmcdJ6zdX7NaHD37kCNS1Cn2EYa YLV/ATl1XPo3aj4vcodmpWxIx4lLnwdON/8vfDY13jVdvDPKZPVDZsiM/D1LsLzMdU5M I50Rv31n6ZpAl7bE9XcsLY/TYw+tij6mUi+gmXNB+prrl0/vptEaAPdgS0FfJOGvLHWw Eu+w== X-Gm-Message-State: AKwxytdXUjwPZ2e0sUct6nx8+CUojvwU2y/HmL+Nrdby5eYunlIx1zdw kk+Snmo1Fza/hgoKTGsyrIdCFQ== X-Received: by 10.28.127.73 with SMTP id a70mr4174235wmd.43.1515781002620; Fri, 12 Jan 2018 10:16:42 -0800 (PST) Received: from localhost.localdomain ([2a02:8071:3e8e:4c00:9ee7:f66:9161:cec2]) by smtp.gmail.com with ESMTPSA id y124sm2722834wmb.42.2018.01.12.10.16.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 10:16:42 -0800 (PST) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Jan 2018 19:16:30 +0100 Message-Id: <20180112181630.22533-2-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180112181630.22533-1-klaxa1337@googlemail.com> References: <20180111022816.GB4926@michaelspb> <20180112181630.22533-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavf/tcp.c: Free allocated client URLContext in case of error. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- libavformat/tcp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 8773493df1..b0289f854f 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -208,8 +208,10 @@ static int tcp_accept(URLContext *s, URLContext **c) return ret; cc = (*c)->priv_data; ret = ff_accept(sc->fd, sc->listen_timeout, s); - if (ret < 0) + if (ret < 0) { + ffurl_closep(c); return ret; + } cc->fd = ret; return 0; }