From patchwork Fri Mar 30 05:08:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 8240 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2483544jad; Thu, 29 Mar 2018 22:09:12 -0700 (PDT) X-Google-Smtp-Source: AIpwx496pGPF6qhuZs4OLsO3gu3oyjvOhTSazmQUQRXZc6pk9iP+7lRZOOg4y3CZyHMdQvKernOM X-Received: by 10.28.211.147 with SMTP id k141mr1041969wmg.15.1522386552812; Thu, 29 Mar 2018 22:09:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522386552; cv=none; d=google.com; s=arc-20160816; b=cQegxtG8iCGhAq2ZdbGSFUBrO26XZt9uqRNvWR2PXoKdJ/oXi3m3KucQtV1nZdNh5n H9DMso84GhpJBhm2dFrl8Mmdt19zf+t3Iwis8KT/ZO/ri9Dks28TeulpM+mxIMJAJpyI 7jcU0vrrGDrxioQtiMGSd/s511B74AmqS4QXy7TnuHRSdtm/q3oPPTV17ZzZrO3/skcu 3X+obAAikcJDUd0oPjU3iKIwU8IGD57dE0V9rauhoGDG0/svEUCe9+P56mQwE6UDqYK8 slKHePLkPgbaFxsXt6+Ugn/W7V1bI38TTfmSDSons09RhTbeWD4+gtH3NclJGW0etBF9 uaVw== 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:feedback-id:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=DJKwfvRiNrlkLCQRV/oq08Em55lzUbEF5MbMwjM55AI=; b=sEpqTTuqsFztViV6Swe70AivmWSxT7+Pxv3zOqgyFeDK+gde5zuTHvu2l+kQr1Gub6 vE0w9Un4IN6YGeRxvijkUFClQVO8OtLrBIWbmABXOiFDe/YeG8CZg8PVgEDcRy3fjQyz icxUfagsi+ZEA3gseLycH4FFzqxOlJQAMpJ14Wnfl0STaGAZqlgeSofk7WP87+7vMxgS s/mLYgNjKrDVEkgtCt+jkz7zE3kwYfAhqdzxLSS61E8fgC4YUO01qnowrp1cKa8j50/K 6x5Vtf1+CLPdt2ZqmgFuqE6jEcP3pNhImwBE4WvhpNaGDhlfdvVTgT1KAUfqA+hvcDMw o+lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=h3/DKQLg; 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=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 68si2460960wmh.108.2018.03.29.22.09.12; Thu, 29 Mar 2018 22:09:12 -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=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=h3/DKQLg; 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=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A23E689FAE; Fri, 30 Mar 2018 08:08:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0266A689CCB for ; Fri, 30 Mar 2018 08:08:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1522387440; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=vOSOI2gu5Q/OUcQB023UoymbcuXP87UbTNlOxhPIMyU=; b=h3/DKQLg 51KvjVuASD0p8uDEjKrDJhJ47tzcrhzJQKldRqVbgcVwsuB6fYxGuKrchnVybe9aqAuUb/WW0kqyk YoV6RIn6Xw6efubBh70jdx6drAr0ObGX1D9oOmIevR9O14MEyyKABzFBZzvCxSjnZnGVX3J4d7ncg Tv+d0ii9vNPCaVJ3niHLBqTH/VyVxzmWYAYB4oDbMb7tOtxdBsmbo0dy0WKa+RKAo80b1n5j28lKM XCSqHtvkmZWVVMp4SdRlSc5fd2TPN3ewgVHkp7fxeczbF1FyPaQOAGNeMthzupQF5mllHcBafmSDD gXJbnNK0wLCOaivwqTbEb5lwuA==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Mar 2018 10:38:52 +0530 Message-Id: <1522386532-16486-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 X-Smtpcorp-Track: 1f1XHbNmF6FXEt.vYZX1VJTr Feedback-ID: 337386m:337386asVRLGB:337386sOLMM6oRBG:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH 6/8] avformat/hlsenc: handling errors in hlsenc_io_open and hlsenc_io_close 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: Vishwanath Dixit MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Vishwanath Dixit --- libavformat/hlsenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 2a54b43..1dd196f 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -272,6 +272,8 @@ static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, URLContext *http_url_context = ffio_geturlcontext(*pb); av_assert0(http_url_context); err = ff_http_do_new_request(http_url_context, filename); + if (err < 0) + ff_format_io_close(s, pb); #endif } return err; @@ -280,6 +282,8 @@ static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename) { HLSContext *hls = s->priv_data; int http_base_proto = filename ? ff_is_http_proto(filename) : 0; + if (!*pb) + return; if (!http_base_proto || !hls->http_persistent || hls->key_info_file || hls->encrypt) { ff_format_io_close(s, pb); #if CONFIG_HTTP_PROTOCOL