| Message ID | 20200322150321.23023-1-lance.lmwang@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,v1] avformat/mxfdec: use av_asprintf() | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
sön 2020-03-22 klockan 23:03 +0800 skrev lance.lmwang@gmail.com: > From: Limin Wang <lance.lmwang@gmail.com> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavformat/mxfdec.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c > index 9113e2a09c..3374f36a88 100644 > --- a/libavformat/mxfdec.c > +++ b/libavformat/mxfdec.c > @@ -2017,7 +2017,7 @@ static MXFStructuralComponent* > mxf_resolve_sourceclip(MXFContext *mxf, UID *stro > static int mxf_parse_package_comments(MXFContext *mxf, AVDictionary > **pm, MXFPackage *package) > { > MXFTaggedValue *tag; > - int size, i; > + int i; > char *key = NULL; > > for (i = 0; i < package->comment_count; i++) { > @@ -2025,12 +2025,10 @@ static int > mxf_parse_package_comments(MXFContext *mxf, AVDictionary **pm, MXFPac > if (!tag || !tag->name || !tag->value) > continue; > > - size = strlen(tag->name) + 8 + 1; > - key = av_mallocz(size); > + key = av_asprintf("comment_%s", tag->name); > if (!key) > return AVERROR(ENOMEM); > > - snprintf(key, size, "comment_%s", tag->name); > av_dict_set(pm, key, tag->value, AV_DICT_DONT_STRDUP_KEY); > } > return 0; Looks OK /Tomas
On Mon, Mar 23, 2020 at 08:29:32PM +0100, Tomas Härdin wrote: > sön 2020-03-22 klockan 23:03 +0800 skrev lance.lmwang@gmail.com: > > From: Limin Wang <lance.lmwang@gmail.com> > > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > > --- > > libavformat/mxfdec.c | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c > > index 9113e2a09c..3374f36a88 100644 > > --- a/libavformat/mxfdec.c > > +++ b/libavformat/mxfdec.c > > @@ -2017,7 +2017,7 @@ static MXFStructuralComponent* > > mxf_resolve_sourceclip(MXFContext *mxf, UID *stro > > static int mxf_parse_package_comments(MXFContext *mxf, AVDictionary > > **pm, MXFPackage *package) > > { > > MXFTaggedValue *tag; > > - int size, i; > > + int i; > > char *key = NULL; > > > > for (i = 0; i < package->comment_count; i++) { > > @@ -2025,12 +2025,10 @@ static int > > mxf_parse_package_comments(MXFContext *mxf, AVDictionary **pm, MXFPac > > if (!tag || !tag->name || !tag->value) > > continue; > > > > - size = strlen(tag->name) + 8 + 1; > > - key = av_mallocz(size); > > + key = av_asprintf("comment_%s", tag->name); > > if (!key) > > return AVERROR(ENOMEM); > > > > - snprintf(key, size, "comment_%s", tag->name); > > av_dict_set(pm, key, tag->value, AV_DICT_DONT_STRDUP_KEY); > > } > > return 0; > > Looks OK will apply thx [...]
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 9113e2a09c..3374f36a88 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2017,7 +2017,7 @@ static MXFStructuralComponent* mxf_resolve_sourceclip(MXFContext *mxf, UID *stro static int mxf_parse_package_comments(MXFContext *mxf, AVDictionary **pm, MXFPackage *package) { MXFTaggedValue *tag; - int size, i; + int i; char *key = NULL; for (i = 0; i < package->comment_count; i++) { @@ -2025,12 +2025,10 @@ static int mxf_parse_package_comments(MXFContext *mxf, AVDictionary **pm, MXFPac if (!tag || !tag->name || !tag->value) continue; - size = strlen(tag->name) + 8 + 1; - key = av_mallocz(size); + key = av_asprintf("comment_%s", tag->name); if (!key) return AVERROR(ENOMEM); - snprintf(key, size, "comment_%s", tag->name); av_dict_set(pm, key, tag->value, AV_DICT_DONT_STRDUP_KEY); } return 0;