From patchwork Fri Jan 12 18:16:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 7267 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp2294216jaa; Fri, 12 Jan 2018 10:23:37 -0800 (PST) X-Google-Smtp-Source: ACJfBothYQ6IPhgDlbGQOXTLAYNwB1GK65nIUovoGcJt+BycXmPo+q+khErcPXWeYQhPNHNoDgzR X-Received: by 10.223.145.41 with SMTP id j38mr23348142wrj.247.1515781416924; Fri, 12 Jan 2018 10:23:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515781416; cv=none; d=google.com; s=arc-20160816; b=xw5MXoqKHeR2uL+7N5NnlUexHZJVt3njI/hMS0MOv+lrZvyP7pgh+I630YCykkqjCL VNODeZxN+zlbSWb+6HMK241t3tN3FIIjX/QHrAimdpEskUi1S67qGRw5vtVOoIejJclf dFfda0GWss01YnEx72inaViTqSStFSTqtIKF/rMnmwhUbIX3IvmD1eok4KQT17qtC4jG wL5mof8uV8smgkpZ1rxpmzKWsBrCZmBPDcTq9qCLiXv9Zca0y38U0h9jx2kbNSqMd1C0 3N+F2mbriAJT8d1EeMq6QcRe5yoCq/NBuXlw0+PtNnFQ8Cfa3mTJlKEYsbpEISDxWGiG y7Vg== 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=PcdLHTzonOV+ncjdecUpum8AMPleM4O/XfDttHPF+SU=; b=ewSBQ5TdiQitCDwZ0CvxNvi7J6xD8F+Ax5DcQbpRI4kNtwqzmSMYNV/COMm+YYXNZI qOEqYGwTML9riOvkZygMI3iBq7CK69xDB+eFlFhyotPDnIXCHdpvZuk0XGIE14kWFikO XSLQGBXGSB6VrlpP09hzwbrA2f1ubpJpiDnbTJRBsxO8xnB5r1WdlP6nBhJJqAy2xlES rgFt77kDNCVqHZCqOuOaJ3tToYgWvf6CGdfgkf/fUZFBtqqDRk58Dxy1zMrZlxLA+pJN zRZSclj9RAeED8MKx7keQggqDB5cOHWM90FaeNrVqn12jjJ8rTo2i6DdXcVImAvKC5WI 2GQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=BN+Ds7/t; 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 h6si2659904wmf.236.2018.01.12.10.23.36; Fri, 12 Jan 2018 10:23:36 -0800 (PST) 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=BN+Ds7/t; 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 CFBBD68A278; Fri, 12 Jan 2018 20:23:31 +0200 (EET) 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 B10F468A255 for ; Fri, 12 Jan 2018 20:23:25 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id i186so13817408wmi.4 for ; Fri, 12 Jan 2018 10:23:26 -0800 (PST) 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=dDTXxuqZC7LxC9jwttLpLUS7lVeRN7tRWMQuoZ668Wg=; b=BN+Ds7/tajaHwI9APQnsLyQQJiwdivPWIavlPnRPFpeeiSQpM7WBPxiV9aZuO9OVfz Htv/Dn1Os6BajQv6MJHQRPxis9GkCCKKZAkHSjdZmeLYzI+F2N3r5MC9ryiDBTMhKRYP 53xTDrMZcT2DtqnxQjYiO/rO/UEZPh9hvU4ALMSDfW3UB1GXKBi0O2/XJ0D0akSUy4Qo U6jeXfav7SSQl+Tvyf7BMAKvIjQYrvPqkm+IvWlVddj75or3YBS9Ic0rEK4XgtAhCKr+ j/rK8B5q4kWKKYFl4jg++sGmPtD/KZIbkOMh+PwOILkSKNSYprs2xh8xe1X5iD7uwU1+ Jbnw== 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=dDTXxuqZC7LxC9jwttLpLUS7lVeRN7tRWMQuoZ668Wg=; b=H8B7qyYePKTZ3ztAi/q2loiUb5uzgS8iwU3e28nVYXl1NPkOL4ByGTg+UqflqD7Pyn RZHIK3lutNeqNk+XsWBP5hdYpf8h1LEg9Ej9Ty0FOFVpCf0KdxALZo6ggmkk1K1U54Pz TQELuBuUECdA+9JQSLB6n9vWm6dkdcV4LxR9EOUd9CRazniLG+9+cpd8Ax8+F8so3Lp2 aOGOETdxHo3RnDnk48VJOoXQ3JlZgxYeo/VgwaG9IVjxf6OiuexiCXwGMLe/nv1hPnOd CMjJ5Eba1dejBBMd5wJqp2l1enDbiIxvAuu7oXNqjZrKAMDfT5shHsuohCWVT8Y6vNQW Lvfw== X-Gm-Message-State: AKwxytfjkYAdeUqncj/xQMcRi3uAHTsX6ZL92YiHBuZPusoB2AivcCLr dn4muBH36+BBXlJSlGmr2bW/AA== X-Received: by 10.28.150.7 with SMTP id y7mr5073823wmd.93.1515781001781; Fri, 12 Jan 2018 10:16:41 -0800 (PST) Received: from localhost.localdomain ([2a02:8071:3e8e:4c00:9ee7:f66:9161:cec2]) by smtp.gmail.com with ESMTPSA id y124sm2722834wmb.42.2018.01.12.10.16.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 10:16:40 -0800 (PST) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Jan 2018 19:16:29 +0100 Message-Id: <20180112181630.22533-1-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111022816.GB4926@michaelspb> References: <20180111022816.GB4926@michaelspb> Subject: [FFmpeg-devel] [PATCH 1/2] lavf/http.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" Signed-off-by: Stephan Holljes --- libavformat/http.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/http.c b/libavformat/http.c index 4806b1e59b..537d0a4773 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -574,7 +574,11 @@ static int http_accept(URLContext *s, URLContext **c) goto fail; cc->hd = cl; cc->is_multi_client = 1; + return 0; fail: + if (c) { + ffurl_closep(c); + } return ret; }