From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 3/6] fftools/ffmpeg: make attachment filenames dynamically allocated
Date: Wed, 17 Jan 2024 10:22:30 +0100
Message-ID: <20240117092233.8503-3-anton@khirnov.net> (raw)
In-Reply-To: <20240117092233.8503-1-anton@khirnov.net>
Do not store the supplied arg pointer directly. While that is valid for
now, it will become ephemeral in the future commits.
---
fftools/ffmpeg_opt.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index ea995f2b5f..563f443bd8 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -124,6 +124,9 @@ static void uninit_options(OptionsContext *o)
#if FFMPEG_OPT_MAP_CHANNEL
av_freep(&o->audio_channel_maps);
#endif
+
+ for (i = 0; i < o->nb_attachments; i++)
+ av_freep(&o->attachments[i]);
av_freep(&o->attachments);
av_dict_free(&o->streamid);
@@ -494,7 +497,10 @@ static int opt_attach(void *optctx, const char *opt, const char *arg)
if (ret < 0)
return ret;
- o->attachments[o->nb_attachments - 1] = arg;
+ o->attachments[o->nb_attachments - 1] = av_strdup(arg);
+ if (!o->attachments[o->nb_attachments - 1])
+ return AVERROR(ENOMEM);
+
return 0;
}
--
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".
next prev parent reply other threads:[~2024-01-17 9:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-17 9:22 [FFmpeg-devel] [PATCH 1/6] fftools/ffprobe: make option strings " Anton Khirnov
2024-01-17 9:22 ` [FFmpeg-devel] [PATCH 2/6] fftools/ffplay: " Anton Khirnov
2024-01-17 9:22 ` Anton Khirnov [this message]
2024-01-17 9:22 ` [FFmpeg-devel] [PATCH 4/6] fftools/cmdutils: add option syntax for loading arbitrary arguments from a file Anton Khirnov
2024-01-17 13:08 ` Michael Niedermayer
2024-01-17 14:48 ` Anton Khirnov
2024-01-17 9:22 ` [FFmpeg-devel] [PATCH 5/6] fftools/ffmpeg: deprecate -filter_complex_script Anton Khirnov
2024-01-17 9:22 ` [FFmpeg-devel] [PATCH 6/6] fftools/ffmpeg: deprecate -filter_script Anton Khirnov
2024-01-17 11:22 ` [FFmpeg-devel] [PATCH 1/6] fftools/ffprobe: make option strings dynamically allocated Zhao Zhili
2024-01-17 12:32 ` Anton Khirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240117092233.8503-3-anton@khirnov.net \
--to=anton@khirnov.net \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git