* [FFmpeg-devel] [PATCH] avutil/dict: Deduplicate freeing dictionary
@ 2024-03-05 15:53 Andreas Rheinhardt
2024-03-07 8:13 ` Andreas Rheinhardt
2024-03-07 9:47 ` epirat07
0 siblings, 2 replies; 3+ messages in thread
From: Andreas Rheinhardt @ 2024-03-05 15:53 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavutil/dict.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavutil/dict.c b/libavutil/dict.c
index 7f23d5336a..6fb09399ba 100644
--- a/libavutil/dict.c
+++ b/libavutil/dict.c
@@ -145,11 +145,8 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
m->elems[m->count].value = copy_value;
m->count++;
} else {
- if (!m->count) {
- av_freep(&m->elems);
- av_freep(pm);
- }
- av_freep(©_key);
+ err = 0;
+ goto end;
}
return 0;
@@ -157,12 +154,13 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
enomem:
err = AVERROR(ENOMEM);
err_out:
+ av_free(copy_value);
+end:
if (m && !m->count) {
av_freep(&m->elems);
av_freep(pm);
}
av_free(copy_key);
- av_free(copy_value);
return err;
}
--
2.40.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avutil/dict: Deduplicate freeing dictionary
2024-03-05 15:53 [FFmpeg-devel] [PATCH] avutil/dict: Deduplicate freeing dictionary Andreas Rheinhardt
@ 2024-03-07 8:13 ` Andreas Rheinhardt
2024-03-07 9:47 ` epirat07
1 sibling, 0 replies; 3+ messages in thread
From: Andreas Rheinhardt @ 2024-03-07 8:13 UTC (permalink / raw)
To: ffmpeg-devel
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavutil/dict.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/libavutil/dict.c b/libavutil/dict.c
> index 7f23d5336a..6fb09399ba 100644
> --- a/libavutil/dict.c
> +++ b/libavutil/dict.c
> @@ -145,11 +145,8 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
> m->elems[m->count].value = copy_value;
> m->count++;
> } else {
> - if (!m->count) {
> - av_freep(&m->elems);
> - av_freep(pm);
> - }
> - av_freep(©_key);
> + err = 0;
> + goto end;
> }
>
> return 0;
> @@ -157,12 +154,13 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
> enomem:
> err = AVERROR(ENOMEM);
> err_out:
> + av_free(copy_value);
> +end:
> if (m && !m->count) {
> av_freep(&m->elems);
> av_freep(pm);
> }
> av_free(copy_key);
> - av_free(copy_value);
> return err;
> }
>
Will apply this patch tomorrow unless there are objections.
- Andreas
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avutil/dict: Deduplicate freeing dictionary
2024-03-05 15:53 [FFmpeg-devel] [PATCH] avutil/dict: Deduplicate freeing dictionary Andreas Rheinhardt
2024-03-07 8:13 ` Andreas Rheinhardt
@ 2024-03-07 9:47 ` epirat07
1 sibling, 0 replies; 3+ messages in thread
From: epirat07 @ 2024-03-07 9:47 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On 5 Mar 2024, at 16:53, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavutil/dict.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/libavutil/dict.c b/libavutil/dict.c
> index 7f23d5336a..6fb09399ba 100644
> --- a/libavutil/dict.c
> +++ b/libavutil/dict.c
> @@ -145,11 +145,8 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
> m->elems[m->count].value = copy_value;
> m->count++;
> } else {
> - if (!m->count) {
> - av_freep(&m->elems);
> - av_freep(pm);
> - }
> - av_freep(©_key);
> + err = 0;
> + goto end;
> }
>
> return 0;
> @@ -157,12 +154,13 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
> enomem:
> err = AVERROR(ENOMEM);
> err_out:
> + av_free(copy_value);
> +end:
> if (m && !m->count) {
> av_freep(&m->elems);
> av_freep(pm);
> }
> av_free(copy_key);
> - av_free(copy_value);
> return err;
> }
>
> --
> 2.40.1
LGTM
>
> _______________________________________________
> 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".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-07 9:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-05 15:53 [FFmpeg-devel] [PATCH] avutil/dict: Deduplicate freeing dictionary Andreas Rheinhardt
2024-03-07 8:13 ` Andreas Rheinhardt
2024-03-07 9:47 ` epirat07
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