From patchwork Fri Feb 28 09:53:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17954 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 CF26244AE64 for ; Fri, 28 Feb 2020 11:54:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B708B68B4FA; Fri, 28 Feb 2020 11:54:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83A0868B494 for ; Fri, 28 Feb 2020 11:53:53 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id n64so1173820wme.3 for ; Fri, 28 Feb 2020 01:53:53 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=A6yc+mckwVTyLgcwjxdSlQbly/g7y71lHYdMZ2deFA8=; b=AeiTVR3tAYRSI/6g1hqI34bwrGm+oD6BRGzfqbrAuyaC/N0oevObLzUHM/pIVQoUOb G9C2pV1y3IIo8sLPrwhzeVelBWzWYXvAsdq/N+jypkFrHJycmdIyQ638Orh21x8Yfqnf UhRRDdF7+w+mUHOmqI+/m3n4h2mHu5IjVrfDd1Cj8y1r+vf0DpmEZlMsbgX+3mbDwhic xvjhdQ9DrhDckGcvRTw24uokVsDHSkfg66f88FAGJmvUzk2dx/QLBuvYkc2dUm4SN1mT 4gj32CTivp/nMck+V1YHA6Bzr4cTex14ioaE+7V3pYWSg1Ww6sBnua7fh7XvHSH/pbjx dllQ== 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:mime-version:content-transfer-encoding; bh=A6yc+mckwVTyLgcwjxdSlQbly/g7y71lHYdMZ2deFA8=; b=b1m5pOIc/wZJzY8e2iQrSDDnP2qJgd1xevXwNVtWR8lUXYJ0rqsFpgmcGacZxUY9rg jzzBMG6D3nFtsPU2XGl3DtbpvW3IMtvwzkrAJcadOGoIsAzM+NK4AmgYK7wFgV0DccCP Tgf2Ci/ALGRz59kCbMJUiFgG9US9L8wtrjo9W0BPwen7/Dbfkc4SnRtzBV24XGezvh2U ym2P5Df8o3CfRwgO84JtMqW04UiYj06hmMIX0N6yRzjSOgOrWfzSg9ex1igGOPX6E5jD szdJk3Dtq21loQakMmmGKCUzuYY0iFXqhZm3zKYtt+YYRs7DC8HdLDQOaEtjqVswJ/nn Jqlg== X-Gm-Message-State: APjAAAXRnjLXbE6IFmkPUXyDE0bKcq79zXr6J1Tt78kusIxwrUd/eP9l SyStaBfv9F/lUgvt2AiC43Ai0eZS X-Google-Smtp-Source: APXvYqy5mTwhv1hPX4dejEmjlTyvJ8XxwUHGCu534qfhJyoJk+kLNi+i3mxnP2bIITVP3Io1BlBV7Q== X-Received: by 2002:a1c:3b09:: with SMTP id i9mr3970107wma.31.1582883632601; Fri, 28 Feb 2020 01:53:52 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id c8sm1453360wru.7.2020.02.28.01.53.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 01:53:52 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2020 10:53:17 +0100 Message-Id: <20200228095321.7222-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228095321.7222-1-andreas.rheinhardt@gmail.com> References: <20200228095321.7222-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/7] avformat/hlsenc: Check some unchecked allocations 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index a281c379f0..18f40ff3ed 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1610,6 +1610,8 @@ 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); @@ -1770,6 +1772,8 @@ static int validate_name(int nb_vs, const char *fn) } fn_dup = av_strdup(fn); + if (!fn_dup) + return AVERROR(ENOMEM); filename = av_basename(fn); subdir_name = av_dirname(fn_dup); @@ -2139,6 +2143,8 @@ static int update_master_pl_info(AVFormatContext *s) int ret = 0; fn1 = av_strdup(s->url); + if (!fn1) + return AVERROR(ENOMEM); dir = av_dirname(fn1); /** @@ -2147,6 +2153,10 @@ 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); } @@ -2854,7 +2864,8 @@ static int hls_init(AVFormatContext *s) if (hls->nb_varstreams > 1) { if (av_stristr(vs->fmp4_init_filename, "%v")) { av_freep(&vs->fmp4_init_filename); - format_name(hls->fmp4_init_filename, &vs->fmp4_init_filename, i, vs->varname); + ret = format_name(hls->fmp4_init_filename, + &vs->fmp4_init_filename, i, vs->varname); } else { ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); }