Message ID | 20180531222415.24966-10-klaxa1337@googlemail.com |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp161776jad; Thu, 31 May 2018 15:25:31 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI/CmOMvHicC6bYY8dcAX8ayQ1wHsOiTN/JoaBnI0/OHvZo1L3REweFH1VzbgJwXuhJvGm2 X-Received: by 2002:a1c:bf43:: with SMTP id p64-v6mr926273wmf.71.1527805531346; Thu, 31 May 2018 15:25:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805531; cv=none; d=google.com; s=arc-20160816; b=iKkXxVUzpvriKikYwZByg3BLWOyxFjNI+BGkDNedD7esgpzvnvT9yUQ9urvHQLNaHf A0P4rNZahkSsdMV1hT1TEK9bEnhYDomagE+hxNQFkz9H1qXw7MbqGDkFF8XvKoJx1BnZ niRV7n0ZsrcRwTCMHBWGyHKXntpWcmUPKkDwGgOneU8gKBhrfrM7py3qHU3MBO39vC27 ggotB+yPpGugUhhUG/tP+L1w26z7P8pUFVhJbPF+Cb+QdYVyyXDZ/eezfhCdKneqCmY5 rNz2XZpmYqVo8UWrLXPpI0vqs2imaHik4Lzh1S4rsF7kJL9qOjtwt4ObdpocDMN5VZPV hq0w== 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=g+tYU6kb0ccCs4mnzU6aG57jRjx963WcVRoM22cri9o=; b=KIdTvDulaLtdBjeGJyIl6WafLwht85FBAM+CWW611ZRsnPixjojhswuu6flgsd4bUG 3XxoOIPPutkzgrc/Os6/XreS+WrUcwHISwFmmgnQzZH7KrQNANDzF83QU7a82Jc4p+fu wlc3YuRxt7fNFG+mJoHusn9ntXsszCEsv/gbF5Tbv66pMlyZt8EBUFImVEB3jamCJDNA EvGBPE7gq6pY+W5+hC82NWX1z3vxnyfMzACJFUzfjwU0tEgula4u1hl+IMmhhhO5PL0W hP1OksdpmAF0Q6j6Tul26ERDKUddIqYe7oBZbcL4Ewu+gRnzm1yrwBBu5PToJPs8Y2cU dFzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=ICw0PzwP; 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g65-v6si324313wme.77.2018.05.31.15.25.30; Thu, 31 May 2018 15:25:31 -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 header.s=20161025 header.b=ICw0PzwP; 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 74A6868A4BB; Fri, 1 Jun 2018 01:23:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 434DA68A48B for <ffmpeg-devel@ffmpeg.org>; Fri, 1 Jun 2018 01:23:52 +0300 (EEST) Received: by mail-wr0-f170.google.com with SMTP id j1-v6so34450520wrm.1 for <ffmpeg-devel@ffmpeg.org>; Thu, 31 May 2018 15:24:37 -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=Jfr9saS3gNnfF1WXiwO7nY5ea5kwGMCGVX/9aPyjI8s=; b=ICw0PzwPjo9G5XEhFuaUVCCoGQQUiKfNd9/MwAGTBhz1R/V7x+ECPiUOQN6xuHvB8e 3Duxn1Y/iQ6T61xmQldOcJx7QdXszjbUs2FwEoVxKY2F1CKO12IVsYmdkaD+JyoPSq4g 0pc/cu9pN+elDe80X1jQkIANpOgqzlx6A1jRu3i9hlUbUJWP9f0t2UFsk82/gb54GgjJ LEP8ldoXe1QQqcZkD+dAXT7cY5avmEVcN7yau61xO/jG+LpyrZXc9hazNto/KItiyVc5 AYug8XUM/rG5FDzPYYX0z3zBFHk7kPm1Kv2KCpJPUYpaSH3UrbguwRh10bt4NPOx9fP6 rSGg== 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=Jfr9saS3gNnfF1WXiwO7nY5ea5kwGMCGVX/9aPyjI8s=; b=WtTZqRIV0oqvzSEP9dRsD+5M+ZsgiCsrpZPaQFZhXu1rds0QQmnbwiStkqr0r+uVlk ax7KjozPWABGn4vZtDdv0AfcREC+LjR3HCgO8i2xnri+kodl0nHd0/u/HWNBCX5UBN8D Wt3a52ZaUgsqnn1ApRg+5dLFrkG8yIvTY0UQzBJ8h/O4excMFBSNPApYc0DIm0ns12As nJOHWzx0cSfwvzZ9xN2ld7hS42cqn53mVh0T0ZWR8CXtCDT0GQY37hBF0C4jPI+0/Ywu 8tYCE1qGbUj0HyAZdwX4Nr4CrGGFb0TqKbOe2POEhNC/CNUKCdFKNj72jNqbls5yDiEo HXkw== X-Gm-Message-State: ALKqPwfmd7JEunrMCLeQt2PVclB+1gVa7lPVqQQPH9HqlYw7C9ssjaVc 8iDypQMmO/+929I0lVIceFYZCQ== X-Received: by 2002:adf:86e9:: with SMTP id 38-v6mr7412178wry.232.1527805476469; Thu, 31 May 2018 15:24:36 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id b72-v6sm705017wmf.11.2018.05.31.15.24.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:24:35 -0700 (PDT) From: Stephan Holljes <klaxa1337@googlemail.com> To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:24:02 +0200 Message-Id: <20180531222415.24966-10-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180531222415.24966-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> <20180531222415.24966-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 09/22] lavfhttpd.c: Free client context if allocated but an error occured X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <http://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <http://ffmpeg.org/pipermail/ffmpeg-devel/> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <http://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Stephan Holljes <klaxa1337@googlemail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> |
diff --git a/lavfhttpd.c b/lavfhttpd.c index 5488e14..d094d65 100644 --- a/lavfhttpd.c +++ b/lavfhttpd.c @@ -66,10 +66,13 @@ int lavfhttpd_accept(void *server, struct HTTPClient **client, int reply_code) int reply_code2 = reply_code; char *method, *resource; if ((ret = avio_accept(server_ctx, &client_ctx)) < 0) { - if (ret == AVERROR(ETIMEDOUT)) + if (ret == AVERROR(ETIMEDOUT)) { return HTTPD_LISTEN_TIMEOUT; - else + } else { + if (client_ctx) + avio_context_free(&client_ctx); return HTTPD_OTHER_ERROR; + } } client_ctx->seekable = 0; ret2 = HTTPD_OK;
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com> --- lavfhttpd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)