diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-03-18 18:01:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-04-01 11:38:44 +0200 |
| commit | c5a61adccab8af56f6308e658b3661f2727cad75 (patch) | |
| tree | fa2df829405c4ef583dea238dea0007ed8c996ea /libavformat | |
| parent | 095f50e06efe907a87d5b70fcd1e55fd14013b6e (diff) | |
| download | ffmpeg-c5a61adccab8af56f6308e658b3661f2727cad75.tar.gz | |
avformat/movenc: Avoid loosing cluster array on failure
Fixes: crash
Fixes: check_pkt.mp4
Found-by: Rafael Dutra <rafael.dutra@cispa.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5c2ff44f915d6ceeea36a2f99e534562764218dd)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6790fe6c45..bade57dcea 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5746,11 +5746,12 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if (trk->entry >= trk->cluster_capacity) { unsigned new_capacity = trk->entry + MOV_INDEX_CLUSTER_SIZE; - if (av_reallocp_array(&trk->cluster, new_capacity, - sizeof(*trk->cluster))) { + void *cluster = av_realloc_array(trk->cluster, new_capacity, sizeof(*trk->cluster)); + if (!cluster) { ret = AVERROR(ENOMEM); goto err; } + trk->cluster = cluster; trk->cluster_capacity = new_capacity; } |