From patchwork Thu May 31 22:24:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9190 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp162139jad; Thu, 31 May 2018 15:26:03 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKcG4k38YDEJyFlR1AuLPseInsI8LxRxcPVHXUXw/gCF/hYjKfT3vhUaZ1zaZqFNey7KWYS X-Received: by 2002:a1c:5b02:: with SMTP id p2-v6mr1000335wmb.20.1527805563677; Thu, 31 May 2018 15:26:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805563; cv=none; d=google.com; s=arc-20160816; b=vfFsvivB2BnORRQ5zodvN+ND94dySgkyRrcgSF1sgUfqdUbavhVfmLaJnlTSHPVYuf GH1wE5+QBhZ0spTW+IpWNOGWaCGgNcl9x/EUSTUkTva0vsdAbqUnWyf8s6ZrCoL9OPFk hE0XqPiR9l6JuUNBCHc1EZObFApVXyiXqP5huBZ5ea8zLlRnsRfADQUzP8NerB1Lbw6E /l984tJlkT2UuR7uDKe1tLvibtjM6tci1KPMzrGWB1ewwamba67sxiItQLWN3bhYwkYU 7ZGqUuJeD+6cR3oRtLeQWk0P7O6tPYcd0DAm5LkHcvr3zUxFNRb689uWiPIDWkJuzzLY IQJg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=LmOwx9Gkz1anmjcXMcCipUYknqhFGnpcO5fLguxbglI=; b=KemZMRkxrE7M2sWnWIcxMh9owrS7Br8HyG2ZUI24DBlG5El4S90aAJ3v0gyAOhfJDq KD6B3IjXC21Lzx0J+REebcs+XHBum617wOq+pb87LG3XZG7VGmxMCnF/F7qeXYDeR780 /KwiGYKB2ZozQrrLESBzNHuVZyY9hvQxX43nq3ksEHuf6EfynoOzy9+WGJKMbXO5CA4u 9Dv6VaB3s9sHRFtWFu7ZZ9F89FxSiteVVkmCBDp/1VjAMHn/JL3BdzsX05/hehgy6EN4 riRbilTZoAPgiIXnsnwEPjouLERi3L8pG9Q5Fkmd+6asXn63e84NufvMXyGIlZjnzc4M MZJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=bGK2F2Ko; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p21-v6si324547wmc.93.2018.05.31.15.26.03; Thu, 31 May 2018 15:26:03 -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 header.s=20161025 header.b=bGK2F2Ko; 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 DDC2D68A4CB; Fri, 1 Jun 2018 01:23:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75CA668A4BC for ; Fri, 1 Jun 2018 01:23:54 +0300 (EEST) Received: by mail-wm0-f47.google.com with SMTP id a8-v6so56608566wmg.5 for ; Thu, 31 May 2018 15:24:39 -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=nQHsaBNphIs28GdvC8XK1sA7ZKi0utemngNzQE8KTu0=; b=bGK2F2KoyLO7rFGV5kmh6t6GpeP+nY/8YMTKUWj6AAjgxch94Sw+2GHEkA3khaaxux KCRXyWXLg+Ofk9ueGbjyEn9BnGAJfDdtgMMjWe3vdsTJnXz28sh3vCZrFDOO8dnbfruQ 6Bp/i9hMJfEtGlJDy3tf5V/G1ShE075VtX8WDeJYhClRWQtmqv5GUSdhsC31KxlfPJVG 3QgsEBd4RGWI5KjRQH4HfVo2M2rg8YsSbrfrYp7QlrCewIzPG3IUGkyWqSUDCO/ACEXY j2Nxw8bQTXQn9uNm5JaKg5K67AH3wpQ2Zc9T3cxvUgPBYIwP+iL3twWjdeniy2wfuume UBkQ== 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=nQHsaBNphIs28GdvC8XK1sA7ZKi0utemngNzQE8KTu0=; b=Yxda8/7p99BIFqfK7LLtdG/Rf5z/fLP4djTjSPMN7j0fRiGAHOC3B777pT74Qb7Z8B XCCXsx35L5hgs8+/9RK3nK1shIkD0fDfFwd40EGMazI6Nv2ANSqvZPnVeCFehehF0yN9 fTd3VxUQNPYBewq46CXHpWxMp7nQJwC5nrrxxK1y03sMNHbYdSZ0lqwKINy6J1yud7aK 969GMr40YeBHEgHwpOcLDpE8DqyoydqOtVAARIZcEnecWn+WMyGu7Izhfgsqoldop1Yj eveVywmoJ2eXG8Ro6+WOOOvNH+va71UIMM4RsIFgwM7xdA5ydn+pHnfRoEHybGCb/us2 aDIg== X-Gm-Message-State: APt69E1gUqDrXrTfMuSxHSS0Lg1VApsS7zgM7pPZzgyT1NsKa1uFsdNv XjlvaN4Z7V9B7qYmD+/hvUL/uw== X-Received: by 2002:a1c:ce0e:: with SMTP id e14-v6mr885562wmg.87.1527805479014; Thu, 31 May 2018 15:24:39 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id b72-v6sm705017wmf.11.2018.05.31.15.24.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:24:38 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:24:04 +0200 Message-Id: <20180531222415.24966-12-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180531222415.24966-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> <20180531222415.24966-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 11/22] ffserver.c/segment.c: set *seg_p to NULL in case of allocation failure and check it 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" Signed-off-by: Stephan Holljes --- ffserver.c | 4 ++++ segment.c | 1 + 2 files changed, 5 insertions(+) diff --git a/ffserver.c b/ffserver.c index 3abf5f8..50d61e5 100644 --- a/ffserver.c +++ b/ffserver.c @@ -151,6 +151,10 @@ void *read_thread(void *arg) av_log(NULL, AV_LOG_DEBUG, "Published new segment.\n"); } segment_init(&seg, ifmt_ctx); + if (!seg) { + av_log(NULL, AV_LOG_ERROR, "Segment initialization failed, shutting down.\n"); + goto end; + } seg->id = id++; av_log(NULL, AV_LOG_DEBUG, "Starting new segment, id: %d\n", seg->id); } diff --git a/segment.c b/segment.c index 986aeb5..72c4663 100644 --- a/segment.c +++ b/segment.c @@ -116,6 +116,7 @@ void segment_init(struct Segment **seg_p, AVFormatContext *fmt) struct Segment *seg = (struct Segment*) av_malloc(sizeof(struct Segment)); if (!seg) { av_log(fmt, AV_LOG_ERROR, "Could not allocate segment.\n"); + *seg_p = NULL; return; }