From: Paul B Mahol <onemda@gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Subject: Re: [FFmpeg-devel] [PATCH 3/3] avutil/dict: Avoid check whose result is known in advance Date: Tue, 13 Sep 2022 21:51:23 +0200 Message-ID: <CAPYw7P7tGoR2sQ=ZZi2snbN+PzfH5Gr4B-cjeVC6+_SejWT-VQ@mail.gmail.com> (raw) In-Reply-To: <GV1P250MB07376CB29C883B97C93CDC4E8F479@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> On 9/13/22, Andreas Rheinhardt <andreas.rheinhardt@outlook.com> wrote: > We know that an AVDictionary is not empty if we have just added > an entry to it, so only check for it being empty on the branch > that does not do so. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavutil/dict.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > LGTM > diff --git a/libavutil/dict.c b/libavutil/dict.c > index 1968063b0b..4bba041d0a 100644 > --- a/libavutil/dict.c > +++ b/libavutil/dict.c > @@ -123,12 +123,12 @@ 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); > } > - if (!m->count) { > - av_freep(&m->elems); > - av_freep(pm); > - } > > return 0; > > -- > 2.34.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". > _______________________________________________ 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:[~2022-09-13 19:51 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-13 19:45 [FFmpeg-devel] [PATCH 1/3] avutil/dict: Fix memleak when using AV_DICT_APPEND Andreas Rheinhardt 2022-09-13 19:46 ` [FFmpeg-devel] [PATCH 2/3] avutil/dict: Improve appending values Andreas Rheinhardt 2022-09-14 12:32 ` Paul B Mahol 2022-09-13 19:46 ` [FFmpeg-devel] [PATCH 3/3] avutil/dict: Avoid check whose result is known in advance Andreas Rheinhardt 2022-09-13 19:51 ` Paul B Mahol [this message] 2022-09-14 12:31 ` [FFmpeg-devel] [PATCH 1/3] avutil/dict: Fix memleak when using AV_DICT_APPEND Paul B Mahol
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='CAPYw7P7tGoR2sQ=ZZi2snbN+PzfH5Gr4B-cjeVC6+_SejWT-VQ@mail.gmail.com' \ --to=onemda@gmail.com \ --cc=andreas.rheinhardt@outlook.com \ --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