From patchwork Tue Apr 11 17:13:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 3364 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp1976080vss; Tue, 11 Apr 2017 10:13:50 -0700 (PDT) X-Received: by 10.223.149.35 with SMTP id 32mr55120919wrs.107.1491930830179; Tue, 11 Apr 2017 10:13:50 -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 c8si18869725wrb.192.2017.04.11.10.13.49; Tue, 11 Apr 2017 10:13:50 -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 6B20E6882A6; Tue, 11 Apr 2017 20:13:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA49D680AB3 for ; Tue, 11 Apr 2017 20:13:34 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id q125so1475546wmd.3 for ; Tue, 11 Apr 2017 10:13:40 -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=fgUaDKANy8gcNmQL/jPD4Z5K2kEKaxvrsVBKZZjaaVU=; b=aA4uafOLW7qnqMfZ+T3FTO95K3tth8ud0DV9tknOhQg0CtjJeO5gNMAOL8pKNkhGyI ZsMUtr7OYqMnWaanRYH8RwVypEgXbnz0aH30OCowwRkLZrHv5ehn8t49+i/+dzDw7Wvt Tpqu5w6V3GfGAr7NVZYX3pt3ExuFUh+hRDtWo5kbSQd1/gCYOCwLSAYqq+e8R7MVylRq mamBDL0cGpxj69n/i3BMwvUkY+L2hpVCbuDuKsQUkVjvaELteDLarfFTZeYDObqkl6eG i5lSj3kRcS+722h3j0npFpNEcOFZTxbaN/0eGjGT1FgKhf8f6/EJq3fgrnKNqG1yaiIt 7eag== 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=fgUaDKANy8gcNmQL/jPD4Z5K2kEKaxvrsVBKZZjaaVU=; b=gQEgCKB8DLv19f6o2UBRMnp3x5K4mYZqr4th+Xoguytm9yMg7Mgz2cvK9NnYQ5EBsR sTFvMrBN+k6733FusbDekV9gjGB1Hnlc1JI6v543EbaXdBU8kRzfOJtyaKUOuXuVQR/M 9yRcqDD/NpplI+XrBdfnfyqjVzPKBYgfFMxHsfx275s0v+7OIrF1gvywLXkNwBpCkVLQ 04rUm8fdcDWo4kVgm+M55ATLYtRd9FpXNwEuHKHrtMhLWolBjzXicVtyqY/Wz7w2D3Gk 7gK3aQRKxFV2u3mjxjY46bdxnABD9+e3mCffHgZFvByJxgT5gNnaVl2FUkwMVeI1lYGL jLVw== X-Gm-Message-State: AN3rC/6bXyfrWxLaN/sWL5QYxH0HtsANWPMmm6vVNuuUgu5k3XiRC8S/ B22umFsDzMNgpw== X-Received: by 10.28.211.73 with SMTP id k70mr15854697wmg.0.1491930820000; Tue, 11 Apr 2017 10:13:40 -0700 (PDT) Received: from localhost.localdomain ([2a02:8071:2e80:600:dafc:93ff:feb9:2c6a]) by smtp.gmail.com with ESMTPSA id d4sm22360528wrb.24.2017.04.11.10.13.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 10:13:39 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Apr 2017 19:13:32 +0200 Message-Id: <20170411171332.10758-2-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170411171332.10758-1-klaxa1337@googlemail.com> References: <20170411171332.10758-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 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; }