From patchwork Tue Apr 11 18:05:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 3367 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp1995929vss; Tue, 11 Apr 2017 11:05:16 -0700 (PDT) X-Received: by 10.223.173.74 with SMTP id p68mr22882825wrc.137.1491933916240; Tue, 11 Apr 2017 11:05:16 -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 b2si15778wmc.17.2017.04.11.11.05.15; Tue, 11 Apr 2017 11:05:16 -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 8DF726882D1; Tue, 11 Apr 2017 21:05:07 +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 269B16805E1 for ; Tue, 11 Apr 2017 21:05:01 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id o81so1790147wmb.0 for ; Tue, 11 Apr 2017 11:05:06 -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=qhyoEFbUHE4JitsT/1ucetbi1VwqB2JLgCje6YucMe4=; b=j7JL7mrtLz7ESl4EdT2zrt225u3G1K16iPdgV2z2yDZ5HHwxxeKVKJeOvw7SjHw39J kA+K71U/OHASaa09KARQi7rsoeWPTMSTZ+zPvhuymZWMTiWKNx4KYIJJktOFzaqvncbn 9UmOn5Dr6+r+KsbGKZ95tIDpwyc3l7thF7E9eYvpjl+ZgaJYvNtj3ONK9M0EKx7ai2Xn JnJd87OVB9xxwRoNa9YglEQ5sPat590KVbJ3HMIZ5lmD2oD5Nn36z+6q2YvxLN+WbABW ngILZaBNlVMpdfm5WOjzuI1AooM3X52i8YqhghiDkqAotuTrJaGYzW45ZOL7fbY+GxCp p6Qw== 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=qhyoEFbUHE4JitsT/1ucetbi1VwqB2JLgCje6YucMe4=; b=FauA4kfmLsqiTaHEXMkuIIdIkyas7ohNqSeEgw5fWuvXyK0XFBdCJ+H4x006gjxdFE pAVDVRBYFDYc4ennvjtu6oB5IXRxqRrKLq6oqHl1sBQZGbN8LNoQByXsL2+9L23RuQ5R 4+pp11ydDfx759mq/R9izWUganqpuKCDBM64grw4G7ix+qeiz6cErsqc1t1tRFHFjn+w h4R44dKJYDt5BhcyfCqJCVPUfu27ED0NoUL+7RbtxYEnRThZ5IaJhBsfq3Ml4zqTqdBk L77ox+v8sOcfsATdcL4e9ayvqEdV8Y7wkEidjkyBDj6mVzA9tCku3Alt3kdWnbq5bKSY 1y4w== X-Gm-Message-State: AN3rC/5hLcMADzgq8TmtUBKR/XaneLUwE1NTnScb3exWkEKglJmS7uU1 Y04i0aygqitW7Q== X-Received: by 10.28.191.75 with SMTP id p72mr15411416wmf.136.1491933906317; Tue, 11 Apr 2017 11:05:06 -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.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 11:05:05 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Apr 2017 20:05:01 +0200 Message-Id: <20170411180502.12739-1-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: 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" --- This version returns 0 in case of success and does not fallthrough to fail:. libavformat/http.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/http.c b/libavformat/http.c index 293a8a7..2917b6e 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -535,7 +535,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_close(*c); + } return ret; }