From patchwork Mon May 28 18:27:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9139 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2231698jad; Mon, 28 May 2018 11:28:33 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKTMcnFCWrDOh7oLyadkaCU5rSpv0Yfq2BFp303IIOfiEr03XHKI6pgdersQm6lkvQ4C1T2 X-Received: by 2002:adf:b053:: with SMTP id g19-v6mr6584838wra.128.1527532113244; Mon, 28 May 2018 11:28:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527532113; cv=none; d=google.com; s=arc-20160816; b=ZP3SgNzO9EDRLnDHJTbeZ3ndIfvQuURg3o4MImEkXUtRAK67/oNNpG+Ebm1TYM+yJ+ wkOiUnKPHKD+KO+4aOncDGttkPp4U5cCV9xuZy5GRMkNE3vSBv1xmbVBmNmgaF0yDJaZ qKYXW8r8JNfUe4MpPn/le61heyrVHGVyh01bS7PJ5uIYpo4y4UjsjeMCETceVP/no4Kc bHMMGkFH060cOSD2WT3u9HiZtooOjB2DMUWTXj+JO9DfPQtqXBLH3uPf0bbXz9ezVeFd XFIF1H49NI5p9QmRxaPuHK0sfXTigf7LV58yOAe43fSwxBRgqNhxu/vBtIRp4uj1441w 0Rzg== 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=PVG1nwiX0D2O/vvAKLc5CziZ7Gk1thQjBlZ1spP/gLLrhwFQ25dVvjLpXWfbD/kz+E 8M/Jv5AUV0o2VlHnX/lj7j7JGv/X0nUWNoFctRJMRRMUg9vYYKayS3TwuHZ+kBAjFuSj lQDo/7a6YPmOpgnxuSrNd9NylVl1IblzvCFu7MbXcyLjIL7Kw3HIm4L7m1cU2BWL5Ire oJ7/HQEePIknYNAyvSIh70X46bgWMYkqJ2MRtO3LvxjT6ZKoW4Xw+9EV0eHqid7sap8P FqRT6yUA96IIyWQZw/d/BAv++676g/+IPCE8zSkwAEZMbNrrz47I7qXQnKXA8QINR2zc 1zMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=sa4Qp1DN; 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 u4-v6si4762272wrp.35.2018.05.28.11.28.32; Mon, 28 May 2018 11:28:33 -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=sa4Qp1DN; 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 E10D668A403; Mon, 28 May 2018 21:26:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA60E68A3E1 for ; Mon, 28 May 2018 21:26:47 +0300 (EEST) Received: by mail-wm0-f46.google.com with SMTP id a67-v6so34029487wmf.3 for ; Mon, 28 May 2018 11:27:31 -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=sa4Qp1DNWE1aZtMq2Fn0QyDXOFsXIVRd1g4PYBg8te4K3bZhCYagvIVKAPJr0M6F3Z J9E72wYLi1U4GYsjSE/OJXTi744Tn7PMG3aPLI6jR79Ksowl8mwjepZrgEMbf5CtM3GD jzfzih8zKcWmk4HxJF0Of7bRVBstI1VIw92QaX8f2hZ+MaqsU4Hqsywb/fKJo8I+qGDz lhvSm1kx10oYsifcwsccm56V8/b7SY4DkmLxnTcWXsgzi/Brfi+FtZqrZb3ZcYkl1Ch2 tK6CtMvZ79TUKpr904XWUO8WvzEFjXRwnv9jqefCHLb2p/bMPTSSb9acadk762o7m6hc bLQw== 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=RSXnI0sXaMoIhuKcRRXzz6JYTqFKmoZ9KEaAtVVXra4C9F27Do4z10FdVPyHPOAxIv 40UMVnnXEWCD9LPzFyehpX/K3rOft4BS2zcKshsiCmaRo6eHHPtGblbTCgvomAGFE64z Gob7wqxFwW9BF0mlQjtSVekW/Tf6mQoVOxqMJ1c8+N00jBuRwwpWZMGMfsf4qACLRlDk sXkVv+QR0zo5EEwU3ktK0zpOrrtywg7m7aKsrsVhdJfH1JeS7dDFCRevjcxhm+8PUhFF +QWBgb/mriKakX8yTueIConEFpuZyBYAJyCgbi9ifkjdvTazwD8dtWTbBZ5xmb/wqYGK zyDg== X-Gm-Message-State: ALKqPwc8cSfAQLn30graJ5VUJOq5Fti1fG644tbuT9yLiyvt+5pQSrKP OO4TBALVyK8vMxE8RNlsGtKk7w== X-Received: by 2002:a1c:c90e:: with SMTP id f14-v6mr8843268wmb.108.1527532050866; Mon, 28 May 2018 11:27:30 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id g205-v6sm4126285wmg.43.2018.05.28.11.27.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 11:27:30 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 May 2018 20:27:10 +0200 Message-Id: <20180528182711.3221-10-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180528182711.3221-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 09/10] 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 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 --- lavfhttpd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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;