From patchwork Mon Apr 10 16:10:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 3356 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp1440772vss; Mon, 10 Apr 2017 09:17:00 -0700 (PDT) X-Received: by 10.28.87.138 with SMTP id l132mr11160014wmb.95.1491841019961; Mon, 10 Apr 2017 09:16:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g102si21891490wrd.40.2017.04.10.09.16.59; Mon, 10 Apr 2017 09:16:59 -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=@googlemail.com; 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 3F4B2689820; Mon, 10 Apr 2017 19:16:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E184689214 for ; Mon, 10 Apr 2017 19:16:45 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id x75so10498082wma.1 for ; Mon, 10 Apr 2017 09:16:50 -0700 (PDT) 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=Kbsix6i9BmN+c18h7+2Ms4N0ceomq8Q7kKXG9rcMjdo=; b=aIzsePnO4OfA/RhjqHjxjnJM4kmktTXsuVDul7kfku9cUsEBII06duiDHFBzJTV3Xf o26x0w7v3u4ZuxJCMVIXwSy45ihzRQRIyjQQyXpB237cyt7xgBgGv4NbiEUZPMbIBwb8 Xa5PmBUyiSZlVk2kQyKtlraLfw++WcDVVaMHZnCk956URr1S9N3NA4M/93MJCZcU6r8Q Hez8NNSGGzjCymJwypl69fRO2Q162AdcX26DDD+6bmUwKgSca5dTQPEYvcCstBTKBW6p fHePWN9cUlKu0jxORu+Vm17JfkjA8g6QjT/hswIANo7ANFuUu+4ST57Kg5v8OqYdDz3k PfYw== 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=Kbsix6i9BmN+c18h7+2Ms4N0ceomq8Q7kKXG9rcMjdo=; b=ZEVZjqr3OvfTBpGNjezOJ6+lKEkmzrSarXyolvyg09DGH8CHHCvEhke1qyV0BWYWYT cTdEJWpB3K7qFcHYs8h8mXAmQ20uaupZurRVAcu65avRUGVd6c8j2cuMjGeXPRhL9Eyc UZypuIo8LGd7ro6IImDgU7okJujBFciGbg5uyH9ex0bxe9SfbMXM6cjtELpQ5IgbSbT2 JtKkuiMcfiBAuoD8YDgEUboTdD3x/MAOUOq77Wj3fjh5UEC5nT3jKjq7HTrpAdBJ9xsJ eFxCNdaciCobhoCkHmY551Dv6yxNkNOn3AQy8Hs14XcJ2wr9XiUeCW4+XCx1FkOW9IVa 4Emw== X-Gm-Message-State: AN3rC/4z6vG45bhjUn0bdxDPLELuFwLxzuPPetDKh4ihyGqBhiqzC+MxWofSKTjCtX6zTw== X-Received: by 10.28.33.66 with SMTP id h63mr10957848wmh.86.1491840664990; Mon, 10 Apr 2017 09:11:04 -0700 (PDT) Received: from localhost.localdomain (HSI-KBW-046-005-002-080.hsi8.kabel-badenwuerttemberg.de. [46.5.2.80]) by smtp.gmail.com with ESMTPSA id i144sm6383205wmf.13.2017.04.10.09.11.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Apr 2017 09:11:04 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Apr 2017 18:10:46 +0200 Message-Id: <20170410161046.3424-2-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170410161046.3424-1-klaxa1337@googlemail.com> References: <20170410161046.3424-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" --- libavformat/tcp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 3055e48..85e500d 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -203,8 +203,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_close(*c); return ff_neterrno(); + } cc->fd = ret; return 0; }