From patchwork Tue Dec 3 11:01:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 16557 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 7BB6B447788 for ; Tue, 3 Dec 2019 13:32:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E65C68ACB2; Tue, 3 Dec 2019 13:07:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E11AC68A132 for ; Tue, 3 Dec 2019 13:07:09 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id z124so1518337pgb.13 for ; Tue, 03 Dec 2019 03:07:09 -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; bh=kGdArLAHjNXFi3GrzXXr8IjDdqK0DVqVTHq3bZ86B4U=; b=aM9VY1dJO2pllHsunvUlOSlyklGrk1BT5jv/rnghEzQxSxBtrRSU3wrbkVuQB+d/FZ 1+NYxU0VCua1ogXjbJ/xIZJYs6+W7McsEeuei9jNCiLY7Vo9oVNOx8uzTG+T/PONctMe +hMfJ9Yc9JhFhKD12QEDttfyXUyd/973E8OgXJvRU2TbR2TjyaHAbRXbJB4RR/FqrTjZ DE7vKh7IxyXPRp78u8n7qIJT4yG+HIDsD/o+YpcdXiViyQaysxz8G7Ohb4x51lZxaCfH FjBinPcbKN1T1aRpDQEFPeNuG4LMvO0eryK1BSCpMjHgVRiVaZAroShFQ2WZyeF8L0lh dEQg== 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=kGdArLAHjNXFi3GrzXXr8IjDdqK0DVqVTHq3bZ86B4U=; b=JwlW5Q0g5xch2D500KH1AeyKaLJAeJAPm/bIvcUZPmWk4td+1mWkPig3CfNfHRCIzn nNTp4jbOhwksqNK8OyX89CZvRiE/31sauwMRGT8nd4gb4psKL7YRl6OewlurDzu32zVd EhCf8yQi/+oBZcG5UsD04qOXdY6STcJNAry9giDA+fCvpEY9o8xbg7vmuLNR1qosV8q4 zCJm8NlG+QJxRvv57n/A8NArUOrYhOq86DCjT7ptNeUb0O80nAonV6F8SQLXXpFDNAXm v5kj4aVN5wkFUOZ3Im8Uv1ZzPBZJ7rDOx5mfFZtb7tIznG7+PTU11/bTWKJPrZ+2ON3F FeRw== X-Gm-Message-State: APjAAAWnElOBpHb1xCbx6qrCgtjPsYevw1+UC3U7c6/NnQmcd5ukr8DO gSW0Ffibw/mofysRk2BNcOSgsNfH X-Google-Smtp-Source: APXvYqzAdaIiLKXYkW97O+13cvn+njNaVPmscL8cQcOHcxEv4l5n/CFS9Giu/0juSegxtz9L8ZM79g== X-Received: by 2002:a62:178b:: with SMTP id 133mr4084528pfx.210.1575370866644; Tue, 03 Dec 2019 03:01:06 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id h6sm3005763pgq.61.2019.12.03.03.01.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Dec 2019 03:01:06 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Dec 2019 19:01:00 +0800 Message-Id: <1575370860-26345-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1575370860-26345-1-git-send-email-mypopydev@gmail.com> References: <1575370860-26345-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 2/2] lavfi/avf_showspectrum: Fix the memory leak in error handle path 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 Fix the memory leak in error handle path. Signed-off-by: Jun Zhao --- libavfilter/avf_showspectrum.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index d5785af..3a3ef7e 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -700,16 +700,15 @@ static int draw_legend(AVFilterContext *ctx, int samples) drawtext(s->outpicref, 2, outlink->h - 10, "CREATED BY LIBAVFILTER", 0); drawtext(s->outpicref, outlink->w - 2 - strlen(text) * 10, outlink->h - 10, text, 0); + av_freep(&text); if (s->stop) { - char *text = av_asprintf("Zoom: %d Hz - %d Hz", s->start, s->stop); + text = av_asprintf("Zoom: %d Hz - %d Hz", s->start, s->stop); if (!text) return AVERROR(ENOMEM); drawtext(s->outpicref, outlink->w - 2 - strlen(text) * 10, 3, text, 0); av_freep(&text); } - av_freep(&text); - dst = s->outpicref->data[0] + (s->start_y - 1) * s->outpicref->linesize[0] + s->start_x - 1; for (x = 0; x < s->w + 1; x++) dst[x] = 200;