From patchwork Thu Jun 28 00:51:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9538 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1479166jad; Wed, 27 Jun 2018 17:52:13 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdywiSKncUF3YdweriLkATosEO6gKZaNbh4uu114AlOGHM8ea1BqKlg07ndOlUNAqa9tQXd X-Received: by 2002:a1c:ee5d:: with SMTP id m90-v6mr6664460wmh.113.1530147133824; Wed, 27 Jun 2018 17:52:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530147133; cv=none; d=google.com; s=arc-20160816; b=SO3ji+/tvI+wRqD0tuwT8XaNo9BcFpcvoQ6BrNvH6sJzK1dyWREHIP44qQxhus4yeV 5QFd3W+D6dB5ooska6Nbwt0qW6tnyIOtlWFeQoGsIXqjGex6zJGSU0MJsrkeorWqjEiV 4BlQNwqrofStNI7PVozyfLOxIn+PP1OioL6SjJmU1/m0mgwe+i2ZAWEmVYADAKAKYtlG dse47mQvnzPkyzO+3zR3Qx2VUVQda7VKQ11TxqWR/Kn05YfI74GouoA7pOE7GKxBJYPd npWzwvaSD2jROzlXztDTcbFLhOSGw5Jsnw7Gvn38q0mU+3eOaZDAuOt5I6FBF1TwWW45 3JjA== 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=HC5YYEDXzA/FymezIxjrP/rky2ULGiO9yn7Z23HnfJU=; b=rUsMbHcmDBtBQBtvQzRzRMDs//8NARlE1oJlEen87wqfcnAzECDIwsnXFBjFxnlRhW I8kZ80pjN+K07t551sM+5LDzXBLykhVFG3/InV76pkV6LjP1E1otVj0CfmmbATlUXa21 SsNrShG4ANdu88P3GwQWptuhByx3vgKMFlAfYzqKu2o59atBeGcb+IvfIKGlgtqGTnzU nrB6itHbpvw6I2W7b/7BxK1rZEw8EC8IGJooW1novstw+N7D92h8Drwy1CinLhaaMEHQ ub8nXI3v3Nmb1WdNVyuRlshLioFjkNYAZmoModH/2OO45LN7WVdwWvLHRExetezsBZkz q5mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=BIfDFtsJ; 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 k81-v6si5142356wmb.202.2018.06.27.17.52.13; Wed, 27 Jun 2018 17:52:13 -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=BIfDFtsJ; 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 8E56868A561; Thu, 28 Jun 2018 03:51:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53BD968A44B for ; Thu, 28 Jun 2018 03:51:35 +0300 (EEST) Received: by mail-wr0-f180.google.com with SMTP id h10-v6so3703851wrq.8 for ; Wed, 27 Jun 2018 17:51:36 -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=E0K30euZAUdd/k0xY4Ipx9+COUM9SKZUbHn+es+db1E=; b=BIfDFtsJXXNCQj5Gj7m1pIgU5oNRejJ2UMh1UUQBxzABQox34/9djxyhvYNss0wNPG D8f0TSCybiQrxuImHfrAqBvor8Vvi6eNuQ907knOfJuNcWC2DvDLPTppazcxPhwy7RgW 80K2zf9JPQM6Z0dBojiUl1deUf+9VWI++jn7FZH2LvvniD9Dq+BiMDkenzqcp/QJHRDi EBO/rCyQk/UjPI7CRsDW6znwJEWGK8Zn/HG52p+9nKNeOHzAC+PLXYwgVMgsfFMnXvuy ZjFphNVY8ENZklYYaykO5we/Ok1bB1Phj1dNwwqxkA+a3GB3yAeFZxwAFxyqvp6UXldr /R5w== 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=E0K30euZAUdd/k0xY4Ipx9+COUM9SKZUbHn+es+db1E=; b=BSeEsLtar16nAvikQ8G0nTHgDXQ3FX2B2nL19MKltchlqCcPEtqv7mIeeWKASP9Wnp pk2GaAOnljqF+w25ouqJ8OJY1l08Ig2SvvrQ8otjvcJRWWfmlGpfjO8WK3J1c6VPdTKD xiGUdamBHaq+8HTf6py38VTkteEOWwQH4Y6TTFXT+egBUVgwUh7qHYqhieKCVkWaZUqv uRO2WnAGa68T2wdm6RkStTVb7HK8vQUjQZ3BSuUWT9n/Gn1vLanoaJgYNR0KPerSxAAL wPclZA+cRxYO4Y/2kTIrglhikLkYOIN/NR52OJ0tM4hUehDPE/c0IgUaDsi/uMKFU2db ykCQ== X-Gm-Message-State: APt69E38MCl9kPC4V0eKPkghukKPMLM/vws/68MM5vC//T6esR1oM7PL QLroax5EYOfvxf1djSKo9mrskA== X-Received: by 2002:adf:ba8f:: with SMTP id p15-v6mr7252180wrg.139.1530147096031; Wed, 27 Jun 2018 17:51:36 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id a9-v6sm1363017wrq.1.2018.06.27.17.51.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 17:51:35 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jun 2018 02:51:08 +0200 Message-Id: <20180628005117.18902-9-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628005117.18902-1-klaxa1337@googlemail.com> References: <20180628005117.18902-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 08/17] segment.c: set *seg_p to NULL earlier so it is NULL for every error condition. 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 --- segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/segment.c b/segment.c index 8b76510..9ec144f 100644 --- a/segment.c +++ b/segment.c @@ -114,9 +114,9 @@ void segment_init(struct Segment **seg_p, AVFormatContext *fmt) int i; AVStream *in_stream, *out_stream; struct Segment *seg = av_malloc(sizeof(struct Segment)); + *seg_p = NULL; if (!seg) { av_log(fmt, AV_LOG_ERROR, "Could not allocate segment.\n"); - *seg_p = NULL; return; }