From patchwork Mon Sep 28 15:14:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22646 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 2490444AD8E for ; Mon, 28 Sep 2020 18:14:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F314D68B6F8; Mon, 28 Sep 2020 18:14:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 967BE688177 for ; Mon, 28 Sep 2020 18:14:26 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id c18so1751238wrm.9 for ; Mon, 28 Sep 2020 08:14:26 -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:reply-to:mime-version :content-transfer-encoding; bh=YWatnSSGUSWH1ZkRXjbMDKJmVwZjNWMwPHFKrYgkIGM=; b=oTZl2if7fPG5QncjPd7oZkuV/QeqWo2/yMh7ng4UwJRCkHx7rCBeQAXF+BoR8W6q0h iDOKuHTBhYA+Mmy3WNa0mSwqFjzAWOTO2l2cO53tJ3CPOgMbxGeFmdzHhH3XfwKXwKIE 3+1IkBqCeNMWQ9LEA0OOdZoo13y0hC1aJTY7Mu91HAoGQWu4DafZ94dxkpDxzgpxgP1q h6UU7KaijhRnLd6iITHQnuuTm5Uh/7PT1+1unxzVxrc6IESWyG/CB5XrMGaIIg+i4fu7 0wmfzkUbdHeM3V/F8wNmUOOsI+duk5Xwtl66b7Sv5Sx2EwuFqQXTrYzitcHmmsRNIVUt Xd3g== 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:reply-to :mime-version:content-transfer-encoding; bh=YWatnSSGUSWH1ZkRXjbMDKJmVwZjNWMwPHFKrYgkIGM=; b=YTXwCpPPW1UDSQtS11mAo5qhLHn9kUF4Ta9Da7ZTI10AvDw94p6E3F+Hcej/Hr8iRo gNL5jaeGs4PuJ0FdT5w41h8RbIpEK+x0XuFElZOz1qUyIRAbuaaiH+l8cYOspHGeGfQB bt3exZXQpmLATwkU0MFGrApvpE2xoXpg/+b9/Ufw5mT4UuQqVPa3Eu3TRMVr5nyz7VnG QEgwqztamrxR9gRrmhF56oIj+lmGD1kOUhvs2GFR9NAQrzxVUK8RyqxlQI+94dfhou7t OoQuzEqeD8YdWwRVi5IZXdsDYj6mopltD52xlqOgQ+PrEkIqjiwWVxGozBIWXbUZVnA2 7chg== X-Gm-Message-State: AOAM533Sbjw8iKYqX/Bg1hjzr/pTT6IrpzxkP+s//uOKAOvcJ5LE3Y2Q pMa1+tMRfew5KAggslfmnKu40Y6jNNo= X-Google-Smtp-Source: ABdhPJxowqilRnlwM9qO19YjDcQ0X/exIm2S3lGF272Aplgw8utko4Z/VYbPiTry0698r69wckYl5g== X-Received: by 2002:adf:ff83:: with SMTP id j3mr2298530wrr.135.1601306065619; Mon, 28 Sep 2020 08:14:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id f12sm1486095wmf.26.2020.09.28.08.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 08:14:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Sep 2020 17:14:18 +0200 Message-Id: <20200928151418.616962-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/movenc: Fix segfault upon allocation error 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/movenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 63adae5e0a..a90bbfa458 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6254,6 +6254,9 @@ static void mov_free(AVFormatContext *s) MOVMuxContext *mov = s->priv_data; int i; + if (!mov->tracks) + return; + if (mov->chapter_track) { avcodec_parameters_free(&mov->tracks[mov->chapter_track].par); }