From patchwork Wed May 10 10:33:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 3638 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp8604vsd; Tue, 9 May 2017 19:34:22 -0700 (PDT) X-Received: by 10.223.152.175 with SMTP id w44mr1804577wrb.122.1494383662670; Tue, 09 May 2017 19:34:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494383662; cv=none; d=google.com; s=arc-20160816; b=pOcuVD7zudxyagn2riERSaSthwZSgOiF1BQRZ+jya26aYog7MZeOQ5ySeiVkBz0UD1 elPho8LUnTMAJOVrYuj+66xajSLKJBgvNSpyOEA8o3ZdjwOl2MFpp0j7hy8fZTPQPUtO 72oPI2nUuT/Du0m/IHflb3CtQzrjSBur5g3ZoYbbCq7J9686jkI0QF9AxwXd1d0VjAmS UODYhst2bc9kzSnDx05QrTzlxlvnlLzLY0/O2L9qjDDZc+Mpnsb46wimNX+WJyYSJgDW X+MZ3rp38xt2E3YW+0ysWkdxOI/uzHBjB2l6rNfFIpQ8FPqxm6PrScG1MuLV1AocYn58 O+tA== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=31Ne+Oo8bQyb4S1dU9y13XwxpHWzvS1pI+sasLOTcv8=; b=uB8UPE4w8GujXZWPAZVP9W39yt/tZgpmH0jaaNzst3NPYbbUVnczWe6ZmE0vT7rwjW LTWbPjBmKoA0DVRUrMg27ERvBzRzAUcQ46pojd7Fi9F9iXfG/2dduD3YdRPzqF0H6aTL gHAfTYlLgW8GOZo9XlRWOBquAm0diN4PNtMigt/sMWe20zJxZqYJ+jfXxq9o8nwac+hH J+D7pEdMHDWW5O/79OXbPfyZTpScQGrphq4gFs0yVaNcHExA8xMRctAMtVVtp8s+blPw 4B9vdEotZFq9rjblg9OGs7SqmJPTCEil6wX3Fk0od77BnXQkq4ksga5LcjRZMMHvN51Q 9tcA== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x62si1834494wrb.294.2017.05.09.19.34.22; Tue, 09 May 2017 19:34:22 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FA69688286; Wed, 10 May 2017 05:34:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg292.qq.com (smtpbg292.qq.com [113.108.11.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB7ED6806AF for ; Wed, 10 May 2017 05:34:06 +0300 (EEST) X-QQ-mid: bizesmtp8t1494383607t09mqb5qy Received: from localhost (unknown [114.255.44.132]) by esmtp4.qq.com (ESMTP) with id ; Wed, 10 May 2017 10:33:24 +0800 (CST) X-QQ-SSF: 01100000002000F0FF40B00A0000000 X-QQ-FEAT: Ngtn/3KK5epm8v7JlCnOntnjk4EaBVID4dKg5UgGjFQ9NHCnWBqwPcXSPefhr LKpVKsAzJ5qnFY2ZvAJNQd+NTmIvJSYLE1sxjAS5xmvj+At4ET4a8Bdr3koi7iu+kAO+9W7 yQyCLwQHZp1ihw55uxyDg7PQuG3vM8Yap1ZAmHe3KIbDuRBE6xUR9B7R5d/98TwMUyvBhvR Uv23YF5Uhf/9iordgdcv8y4R/orbm7jMjc5XJxDj3j+VSkkwldY3jh3LGqC5p7qyuFyk0LU Ux7A== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 May 2017 18:33:14 +0800 Message-Id: <20170510103314.4275-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.13.0.rc2 X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: move old_filename free operation earlier 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Suggested-by: Aaron Levinson Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 221089c..7ed121a 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1549,14 +1549,13 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) sls_flag_file_rename(hls, old_filename); ret = hls_start(s); } + av_free(old_filename); if (ret < 0) { - av_free(old_filename); return ret; } if ((ret = hls_window(s, 0)) < 0) { - av_free(old_filename); return ret; } }