eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

avformat/movenc: fix dynamic buffer leaks on error paths

Browse Source 
In mov_write_iacb_tag(), the dynamic buffer dyn_bc was leaked when
ff_iamf_write_descriptors() failed.

In mov_write_track_udta_tag(), the dynamic buffer pb_buf was leaked
when mov_write_track_kinds() failed, as the error path returned
directly instead of going through cleanup.

Fix both by ensuring ffio_free_dyn_buf() is called on all error paths.
This commit is contained in:
jiangjie
2026-05-09 19:23:46 +08:00
parent 180a10647d
commit 2f4ad2497e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/movenc.c
+6 -3
View File
@@ -352,8 +352,10 @@ static int mov_write_iacb_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
avio_w8(pb, 1); // configurationVersion
ret = ff_iamf_write_descriptors(track->iamf, dyn_bc, s);
if (ret < 0)
if (ret < 0) {
ffio_free_dyn_buf(&dyn_bc);
return ret;
}
dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
ffio_write_leb(pb, dyn_size);
@@ -4346,7 +4348,7 @@ static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
if (mov->mode & MODE_MP4) {
if ((ret = mov_write_track_kinds(pb_buf, st)) < 0)
return ret;
goto end;
}
if ((size = avio_get_dyn_buf(pb_buf, &buf)) > 0) {
@@ -4354,9 +4356,10 @@ static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
ffio_wfourcc(pb, "udta");
avio_write(pb, buf, size);
}
end:
ffio_free_dyn_buf(&pb_buf);
return 0;
return ret;
}
static int mov_write_trak_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext *mov,