diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-03-18 18:01:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:20 +0200 |
| commit | bf8e7c2b17d1d142627aa78f0b51fa1abcb2bef2 (patch) | |
| tree | 645c657be79c731f7fc54806428e56094d984ae6 | |
| parent | 92049dc2054e99fad8b041c53ba7bdfd2b3dceab (diff) | |
| download | ffmpeg-bf8e7c2b17d1d142627aa78f0b51fa1abcb2bef2.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>
| -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 03df35f2da..ace6081106 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4881,11 +4881,12 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if (trk->entry >= trk->cluster_capacity) { unsigned new_capacity = 2 * (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; } |