[FFmpeg-devel] [PATCH 1/3] avutil/dict: av_realloc -> av_realloc_array()

lance.lmwang at gmail.com lance.lmwang at gmail.com
Mon Jun 1 17:05:54 EEST 2020


On Sat, May 30, 2020 at 11:14:03AM -0300, James Almer wrote:
> On 5/30/2020 10:55 AM, lance.lmwang at gmail.com wrote:
> > On Sat, May 30, 2020 at 03:32:18PM +0200, Nicolas George wrote:
> >> lance.lmwang at gmail.com (12020-05-30):
> >>> From: Limin Wang <lance.lmwang at gmail.com>
> >>>
> >>> Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> >>> ---
> >>>  libavutil/dict.c | 4 ++--
> >>>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/libavutil/dict.c b/libavutil/dict.c
> >>> index 0ea7138..a1107b1 100644
> >>> --- a/libavutil/dict.c
> >>> +++ b/libavutil/dict.c
> >>> @@ -103,8 +103,8 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
> >>>          av_free(tag->key);
> >>>          *tag = m->elems[--m->count];
> >>>      } else if (copy_value) {
> >>> -        AVDictionaryEntry *tmp = av_realloc(m->elems,
> >>> -                                            (m->count + 1) * sizeof(*m->elems));
> >>
> >>> +        AVDictionaryEntry *tmp = av_realloc_array(m->elems,
> >>> +                                            m->count + 1, sizeof(*m->elems));
> >>
> >> If you change something, make sure the alignment is correct.
> > I think it's cosmetic changes, so I didn't change the alignment for the first version.
> > If it's OK, I'll update with format changes also.
> 
> It makes sense to not bother with cosmetics when it reduces the amount
> of changed lines and a patch about functional changes, but in this case
> the line in question is going to be changed no matter what, so might as
> well just align it at the same time and save yourself an extra commit
> for it.

thanks, will follow it next time.

> 
> > 
> >>
> >>>          if (!tmp)
> >>>              goto err_out;
> >>>          m->elems = tmp;
> >>
> >> Regards,
> >>
> >> -- 
> >>   Nicolas George
> > 
> > 
> > 
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".

-- 
Thanks,
Limin Wang


More information about the ffmpeg-devel mailing list