generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

movenc: Avoid leaking locally allocated data when returning on errors

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2014-11-02 23:50:47 +02:00
parent 95a449d3ce
commit 8cb7b7b461
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/movenc.c
View File

@@ -3065,7 +3065,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
MOVTrack *trk = &mov->tracks[pkt->stream_index]; MOVTrack *trk = &mov->tracks[pkt->stream_index];
AVCodecContext *enc = trk->enc; AVCodecContext *enc = trk->enc;
unsigned int samples_in_chunk = 0; unsigned int samples_in_chunk = 0;
int size = pkt->size; int size = pkt->size, ret = 0;
uint8_t *reformatted_data = NULL; uint8_t *reformatted_data = NULL;
if (mov->flags & FF_MOV_FLAG_FRAGMENT) { if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
@@ -3139,16 +3139,20 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
/* copy frame to create needed atoms */ /* copy frame to create needed atoms */
trk->vos_len = size; trk->vos_len = size;
trk->vos_data = av_malloc(size); trk->vos_data = av_malloc(size);
if (!trk->vos_data) if (!trk->vos_data) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto err;
}
memcpy(trk->vos_data, pkt->data, size); memcpy(trk->vos_data, pkt->data, size);
} }
if (trk->entry >= trk->cluster_capacity) { if (trk->entry >= trk->cluster_capacity) {
unsigned new_capacity = 2 * (trk->entry + MOV_INDEX_CLUSTER_SIZE); unsigned new_capacity = 2 * (trk->entry + MOV_INDEX_CLUSTER_SIZE);
if (av_reallocp_array(&trk->cluster, new_capacity, if (av_reallocp_array(&trk->cluster, new_capacity,
sizeof(*trk->cluster))) sizeof(*trk->cluster))) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto err;
}
trk->cluster_capacity = new_capacity; trk->cluster_capacity = new_capacity;
} }
@@ -3212,8 +3216,10 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams)
ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry, ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry,
reformatted_data, size); reformatted_data, size);
err:
av_free(reformatted_data); av_free(reformatted_data);
return 0; return ret;
} }
static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)