From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2AC904875C for ; Wed, 17 Jan 2024 09:23:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68ABB68CF24; Wed, 17 Jan 2024 11:22:49 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22C6A68CCBD for ; Wed, 17 Jan 2024 11:22:40 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=EeDaIhJn; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 4645C19C0 for ; Wed, 17 Jan 2024 10:22:39 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id WrjHKnWSUJjz for ; Wed, 17 Jan 2024 10:22:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1705483358; bh=hBy2SwjOlVFR460REJOv2zF8xbfUKVGYOUxZ12sFUnI=; h=From:To:Subject:Date:From; b=EeDaIhJnuk/dVKBnN1goEGPwZFEhftNdSM35g7v7dOh/H0oFL5Wpt9hAcJK31uCJB CmNIac7EC72TxRs7a+fBh1EaS+mp2F/8E75zM2KNuEAReX5Kzs3DqcV02CHpij3rQw 2YkBmbEEEO13u3VnsYUhe0YMCRbevOyaMIeD3WlGbTT4ABSNpdg8OcLaD2zwYY/dnn LkJrlC/xdeHhsfa2uSlXzSmwqcBu1O663LQbA0yg5njRGn5tx0mh9EMpqRualQKtHY BGpwYgpyCTcM5RVH31TkL5hBkAjj3kmMJRO5wh/OMnpJcWYZajHEbzLZg1TdfdUExg 0QSmYocdYf3qg== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 16089EE8 for ; Wed, 17 Jan 2024 10:22:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E4BF63A0219 for ; Wed, 17 Jan 2024 10:22:37 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Jan 2024 10:22:28 +0100 Message-ID: <20240117092233.8503-1-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] fftools/ffprobe: make option strings dynamically allocated X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Do not store the supplied arg pointer directly. While that is valid for now, arg will become ephemeral in the future commits. --- fftools/ffprobe.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index f00ba48620..3a7aae3572 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3827,8 +3827,10 @@ static int opt_input_file(void *optctx, const char *arg) return AVERROR(EINVAL); } if (!strcmp(arg, "-")) - arg = "fd:"; - input_filename = arg; + arg = "pipe:"; + input_filename = av_strdup(arg); + if (!input_filename) + return AVERROR(ENOMEM); return 0; } @@ -3849,15 +3851,18 @@ static int opt_output_file_o(void *optctx, const char *opt, const char *arg) } if (!strcmp(arg, "-")) arg = "fd:"; - output_filename = arg; + output_filename = av_strdup(arg); + if (!output_filename) + return AVERROR(ENOMEM); return 0; } static int opt_print_filename(void *optctx, const char *opt, const char *arg) { - print_input_filename = arg; - return 0; + av_freep(&print_input_filename); + print_input_filename = av_strdup(arg); + return print_input_filename ? 0 : AVERROR(ENOMEM); } void show_help_default(const char *opt, const char *arg) @@ -4287,6 +4292,9 @@ int main(int argc, char **argv) end: av_freep(&output_format); + av_freep(&output_filename); + av_freep(&input_filename); + av_freep(&print_input_filename); av_freep(&read_intervals); av_hash_freep(&hash); -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".