RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-08 23:58:51 +00:00
Code Issues Projects Releases Wiki Activity

avformat/oggdec: Avoid duplicating buffer when adding side-data

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-05-23 13:06:04 +02:00
parent 9fee37c56e
commit c0f01eaf12
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/oggdec.c
View File

@ -877,14 +877,12 @@ retry:
} }
if (os->new_metadata) { if (os->new_metadata) {
uint8_t *side_data = av_packet_new_side_data(pkt, ret = av_packet_add_side_data(pkt, AV_PKT_DATA_METADATA_UPDATE,
AV_PKT_DATA_METADATA_UPDATE, os->new_metadata, os->new_metadata_size);
os->new_metadata_size); if (ret < 0)
if(!side_data) return ret;
return AVERROR(ENOMEM);
memcpy(side_data, os->new_metadata, os->new_metadata_size); os->new_metadata = NULL;
av_freep(&os->new_metadata);
os->new_metadata_size = 0; os->new_metadata_size = 0;
} }

2
libavformat/oggparsevorbis.c
View File

@ -287,7 +287,7 @@ static int vorbis_update_metadata(AVFormatContext *s, int idx)
os->new_metadata = av_packet_pack_dictionary(st->metadata, &os->new_metadata_size); os->new_metadata = av_packet_pack_dictionary(st->metadata, &os->new_metadata_size);
/* Send an empty dictionary to indicate that metadata has been cleared. */ /* Send an empty dictionary to indicate that metadata has been cleared. */
} else { } else {
os->new_metadata = av_malloc(1); os->new_metadata = av_mallocz(1);
os->new_metadata_size = 0; os->new_metadata_size = 0;
} }