diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-10-09 15:20:15 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-10-09 15:39:05 +0200 |
| commit | 18ff4d20201ae69fdeb2da2c90bdcbd33f7ac025 (patch) | |
| tree | 200582b5430b871b85f9fc5b51be8a9c893e7af7 /avconv_opt.c | |
| parent | 4ffbe3f3a5d9892841d9bc31d859916c2c61123f (diff) | |
| download | ffmpeg-18ff4d20201ae69fdeb2da2c90bdcbd33f7ac025.tar.gz | |
avconv: simplify memory allocation in copy_chapters
Make just a single reallocation per call instead of one reallocation
per copied chapters. This fixes possible memory leaks on realloc
failures. Also correct the allocation since it needs multiples of
sizeof(AVChapter*) and not sizeof(AVChapter).
Fixes CID700633 and CID700719.
Diffstat (limited to 'avconv_opt.c')
| -rw-r--r-- | avconv_opt.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/avconv_opt.c b/avconv_opt.c index 108e510516..f8a76c0978 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -1085,8 +1085,14 @@ static int copy_chapters(InputFile *ifile, OutputFile *ofile, int copy_metadata) { AVFormatContext *is = ifile->ctx; AVFormatContext *os = ofile->ctx; + AVChapter **tmp; int i; + tmp = av_realloc(os->chapters, sizeof(*os->chapters) * (is->nb_chapters + os->nb_chapters)); + if (!tmp) + return AVERROR(ENOMEM); + os->chapters = tmp; + for (i = 0; i < is->nb_chapters; i++) { AVChapter *in_ch = is->chapters[i], *out_ch; int64_t ts_off = av_rescale_q(ofile->start_time - ifile->ts_offset, @@ -1112,11 +1118,7 @@ static int copy_chapters(InputFile *ifile, OutputFile *ofile, int copy_metadata) if (copy_metadata) av_dict_copy(&out_ch->metadata, in_ch->metadata, 0); - os->nb_chapters++; - os->chapters = av_realloc(os->chapters, sizeof(AVChapter) * os->nb_chapters); - if (!os->chapters) - return AVERROR(ENOMEM); - os->chapters[os->nb_chapters - 1] = out_ch; + os->chapters[os->nb_chapters++] = out_ch; } return 0; } |