From patchwork Tue Sep 24 11:23:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15253 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0B141449561 for ; Tue, 24 Sep 2019 14:24:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECFCD689E51; Tue, 24 Sep 2019 14:24:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 256A0689B7E for ; Tue, 24 Sep 2019 14:24:27 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id f19so880007plr.3 for ; Tue, 24 Sep 2019 04:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lOVn9IuXdJSP3iO9+5aszEM19mE3wuN3iWpr6Jtk1aI=; b=k9DYQFGxgEbcT1DRYjTZG4cDK2pS1XZsqEIgEtCqs/g2nCEYdZ62qIRiAbAqFI9qR8 uUOrb3j/FiyrKHjm3vBMPATTWQbrDNQe9XVtyxYqUkT2Y+M92sSueg9GyDtiKzwrUaNr PP0WOgOYXExKiXBFjdBluGOsky4ZVKi5WIEqwZgPQy9urHLmkBqPyQHQyPpOP39d8DmW PdeZkKBcNktrJcHMkJIgONzcH3KUgmJCxrWOVdBsLUcyQZYw5cMGD58AB6ZDP2yC3+sB ZXmMgZPQfZlEf80n42ZTHXyWIIlJ/NHJOX6OS2wGjweYUcAReLpvqhCq1AW1j8ChGWT8 CWKA== 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=lOVn9IuXdJSP3iO9+5aszEM19mE3wuN3iWpr6Jtk1aI=; b=sc3dXRJctKam+rtZycv4nQDH91M350wGD0l134kes6WmYEw2IOeCxYVpvtfRlDZUQy rUGcP+LrLjyfxjyCkOZwHKlKC/grp9ek+PtIjCw81kf6ysR/9BOBF1yPmaYEhL8f0XHy g7q/Rq2wld2ISpxZt5E1IbKnjxWwjCEydgqDA25NSmpF3N3jzl+0Ne99MqpRpOfFD2eU 9rRmwUODR4wSC4eGEgLIJ/xMDZuyCYBbb+5a78AHkT3l5Btdok4LLzbJK0hNCw28zh8/ zJd2a6JNYW/ESlaEXWPy9eBwoQsXPOE1hF6TiuTjsIBqSDQdxGLXzYYkMjiepX2gXRc4 eszA== X-Gm-Message-State: APjAAAVxdE2NOg5Kzx+rVxcOvo4VP5g5gybFcgq4E23qOQv+KO9QuPib +RQadQ7pQvsmYq9P+WqyfBe0rxaT X-Google-Smtp-Source: APXvYqxQowFEXiVDc5R9rD7ywbrNTEN6X0B7CSwtlrBesRDNo7HSLe3i477UZ1c/SEykAZWT4LNrSQ== X-Received: by 2002:a17:902:6bc5:: with SMTP id m5mr2414027plt.169.1569324265508; Tue, 24 Sep 2019 04:24:25 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id y7sm1887217pfn.142.2019.09.24.04.24.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Sep 2019 04:24:24 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Sep 2019 19:23:59 +0800 Message-Id: <20190924112401.14020-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190924112401.14020-1-lance.lmwang@gmail.com> References: <1568595818-7943-1-git-send-email-lance.lmwang@gmail.com> <20190924112401.14020-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 2/4] avformat/hlsenc: remove the unnecessary null pointer check 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Reviewed-by: Liu Steven Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 1f2bdfbe4d..d663785e4a 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1613,16 +1613,13 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) if (c->use_localtime_mkdir) { const char *dir; char *fn_copy = av_strdup(oc->url); - if (!fn_copy) { - return AVERROR(ENOMEM); - } dir = av_dirname(fn_copy); if (ff_mkdir_p(dir) == -1 && errno != EEXIST) { av_log(oc, AV_LOG_ERROR, "Could not create directory %s with use_localtime_mkdir\n", dir); - av_free(fn_copy); + av_freep(&fn_copy); return AVERROR(errno); } - av_free(fn_copy); + av_freep(&fn_copy); } } else { char *filename = NULL; @@ -1784,11 +1781,6 @@ static int validate_name(int nb_vs, const char *fn) } fn_dup = av_strdup(fn); - if (!fn_dup) { - ret = AVERROR(ENOMEM); - goto fail; - } - filename = av_basename(fn); subdir_name = av_dirname(fn_dup); @@ -1846,11 +1838,6 @@ static int format_name(const char *buf, char **s, int index, const char *varname /* if %v is present in the file's directory, create sub-directory */ if (av_stristr(dir, "%v") && proto && !strcmp(proto, "file")) { mod_buf_dup = av_strdup(*s); - if (!mod_buf_dup) { - ret = AVERROR(ENOMEM); - goto fail; - } - dir = av_dirname(mod_buf_dup); if (ff_mkdir_p(dir) == -1 && errno != EEXIST) { ret = AVERROR(errno); @@ -2151,11 +2138,6 @@ static int update_master_pl_info(AVFormatContext *s) int ret = 0; fn1 = av_strdup(s->url); - if (!fn1) { - ret = AVERROR(ENOMEM); - goto fail; - } - dir = av_dirname(fn1); /** @@ -2164,10 +2146,6 @@ static int update_master_pl_info(AVFormatContext *s) */ if (dir && av_stristr(av_basename(dir), "%v")) { fn2 = av_strdup(dir); - if (!fn2) { - ret = AVERROR(ENOMEM); - goto fail; - } dir = av_dirname(fn2); }