From patchwork Mon Aug 19 13:01:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 14583 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 8AC0D447E2D for ; Mon, 19 Aug 2019 16:08:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 629E568AB0E; Mon, 19 Aug 2019 16:08:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A3B968A1CC for ; Mon, 19 Aug 2019 16:08:14 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id 129so1153630pfa.4 for ; Mon, 19 Aug 2019 06:08:14 -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=h43HDxomMR8D7pse7mmfazym508UmawjGDDWNaIQGTU=; b=GA3Wra6ylXX6FiXah6rUbLxqO//YTk50mAnOGcOfHHzy3b+CZ5XDTMD07LziPL5Zc5 WuYQ74UpBs9aSYQBLBRYtFVIO417/D46Xg/UzZtWStsag6MW29YA5egRgmd03aDC/lUd Qhrn0OCmilb7eRNcffSG84bmxTIpwV1iXoG+rTi1pjrfpKXegcW0X7hmN/NN9E7bTxiu LhKiTyGIX6VponxMc0kQWkMkWTJrUmvLjWK77o6Z6+43a693IieeoHanNPt77bg/7JV6 l5qYLid6mPQBJr9sIF+Mk2XI20AZm4ZSAqDa9xxVryYidKbXOiW6Mmv5HnJVK3cw7kyx lYtg== 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=h43HDxomMR8D7pse7mmfazym508UmawjGDDWNaIQGTU=; b=SI9231dVyZw5WfjvcQzD45ebJRWyRqZfb2nTMLqw3OMpBjP+MOob9uPOm6ZtJKnLuI 5KYm5jPlVvi4iOZE0HPGGPhZh7jpqjQPBe145qu9Fz8oS8yxEBHul8i4Ipw+6/y49zP1 CcHL8okPW3x7s3HdoMwE2JHr6Adn487NuPEbMqAhAp8O+MzuhbR82qYNrGeEYEIaVc27 PXRvWiFn6Hof/HVYjWy/Dp0TuugmDjjwADUOJ1OKsBjbJ2w8QjO7/U2EYwFB9br0MtNI J/e9Paam1MGRT+F/vRJ8Xp98BWQmyy+098EdrVQjO/rCYN6fytK/wiyCgn4WfUQWqB0d 6Y5A== X-Gm-Message-State: APjAAAUifbL/leSC75/2RPRMf2gFY6vLDv61x2e48/YWyLXaE3f7c3Ur f70RARqIOGjrgOHVDCD3odJop41y X-Google-Smtp-Source: APXvYqxkiTjeqT3Tnid8XM0sRsGXBhWitf4MNixLdPoUhuqTs8xuY/3b1/vyufji7RLJ+P7BBXO45g== X-Received: by 2002:a62:5501:: with SMTP id j1mr5440736pfb.166.1566219676001; Mon, 19 Aug 2019 06:01:16 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s125sm20865656pfc.133.2019.08.19.06.01.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Aug 2019 06:01:15 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Aug 2019 21:01:04 +0800 Message-Id: <1566219667-22805-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1566219667-22805-1-git-send-email-mypopydev@gmail.com> References: <1566219667-22805-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 2/5] lavfi/avfiltergraph: add check before free the format 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao ff_merge_samplerates will be deallocate a or b in some case, so add a check before free the format. Signed-off-by: Jun Zhao --- libavfilter/avfiltergraph.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index a149f8f..2fe4f0b 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -419,8 +419,10 @@ static int can_merge_formats(AVFilterFormats *a_arg, av_freep(&ret); return 1; } else { - av_freep(&a->formats); - av_freep(&b->formats); + if (a) + av_freep(&a->formats); + if (b) + av_freep(&b->formats); av_freep(&a); av_freep(&b); return 0;