From patchwork Tue Apr 11 18:05:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 3366 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp1995999vss; Tue, 11 Apr 2017 11:05:24 -0700 (PDT) X-Received: by 10.28.151.137 with SMTP id z131mr15433812wmd.138.1491933923976; Tue, 11 Apr 2017 11:05:23 -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 o77si4114027wmd.17.2017.04.11.11.05.23; Tue, 11 Apr 2017 11:05:23 -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 E57996882F8; Tue, 11 Apr 2017 21:05:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80D1C6882C8 for ; Tue, 11 Apr 2017 21:05:02 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id o81so1790283wmb.0 for ; Tue, 11 Apr 2017 11:05:08 -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=yBSMD/IPup8LhzZfmS59NGA+QhBBzZdEKyN6NEPIf4s=; b=hpsBLFjZDmqdebf0eqLDoXJ8pVUPQKalIElJK25SCf1HQYQYf5XrcTiep6TVin+z0O qfuohLqtiJeqRyR6rTopW7YY2/4W2JdqcXs8f5KzpNym3eWpq/RwDqT0ZfyAO9JB882m rEZksYyVipHsQGbWdnB6JorcbydT6TLwiXUYWhbvwZd5L+sm6TW9w9xCwO0S+DJ22Zd3 4KV1o4jbMylYMf4mQHra+/PlHP5RxZGPiakFkCcbTQlAvy5GuzRleOV/pKwN+/m26YF3 qbvXD5b/BsHc3PVS/NfUqZ/3r2WT3VkLe/4EVV6NxKCoKOqjDilA4mZQf0hQ9XfOX4z8 MGrA== 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=yBSMD/IPup8LhzZfmS59NGA+QhBBzZdEKyN6NEPIf4s=; b=ZrjX6nK3/u3f1Zug2Ja2fnAk/dclhUfgc8zhINt74ttnbTRlZzpTPsS3UMAeDht5pz A02lta/NNzsHwVfohyzxSgZ9Eys9sQWVaXkmR4cExOb/ktVIzqUNbdTMQudOCRsl4KEH x4yLgjg4yV5rZNFjE6koakdXnSKTCuH289YND3zTFZA16s2Ja0uVpTIWBs8JOY6lWVNt v2+zbjWzodb1hks8wKloV2b1OIYdN80fTiBxE0RwRNhxXka5yYR1o4/RWxrLClmseOQ6 6CWYx9YoEE9guSxTeTwulKq7otszod04oZva2cthyWN+IzdWawug2rRCg5vkXcAZXaWW Er8A== X-Gm-Message-State: AN3rC/6Gx1d7iXh6Y9KGU7cXUWoQuMgtecFSNT6/ZOIB53t+6scUe9bi RjbrknV38AyoSQ== X-Received: by 10.28.154.85 with SMTP id c82mr12013537wme.100.1491933907676; Tue, 11 Apr 2017 11:05:07 -0700 (PDT) Received: from localhost.localdomain ([2a02:8071:2e80:600:dafc:93ff:feb9:2c6a]) by smtp.gmail.com with ESMTPSA id c18sm22321582wre.48.2017.04.11.11.05.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 11:05:07 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Apr 2017 20:05:02 +0200 Message-Id: <20170411180502.12739-2-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170411180502.12739-1-klaxa1337@googlemail.com> References: <20170411180502.12739-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" --- This version is rebased on Simon's tcp return fix. libavformat/tcp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 07b4ed9..f1a597d 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 ret; + } cc->fd = ret; return 0; }