diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 13:34:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 13:37:31 +0200 |
| commit | c5714097eb4c5545f41b5dcb522f7d7470d6f733 (patch) | |
| tree | ca2f4b5152faa77f62b6a90babf8c15141fc75f9 | |
| parent | 9bca8e534150cd0d2d6bc8dc5c142c6ea2de6699 (diff) | |
| download | ffmpeg-c5714097eb4c5545f41b5dcb522f7d7470d6f733.tar.gz | |
avformat/mxfdec: use av_realloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mxfdec.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 29a2f563e6..e8ee74131a 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -433,10 +433,7 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size uint64_t footer_partition; uint32_t nb_essence_containers; - if (mxf->partitions_count+1 >= UINT_MAX / sizeof(*mxf->partitions)) - return AVERROR(ENOMEM); - - tmp_part = av_realloc(mxf->partitions, (mxf->partitions_count + 1) * sizeof(*mxf->partitions)); + tmp_part = av_realloc_array(mxf->partitions, mxf->partitions_count + 1, sizeof(*mxf->partitions)); if (!tmp_part) return AVERROR(ENOMEM); mxf->partitions = tmp_part; @@ -563,9 +560,8 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size static int mxf_add_metadata_set(MXFContext *mxf, void *metadata_set) { MXFMetadataSet **tmp; - if (mxf->metadata_sets_count+1 >= UINT_MAX / sizeof(*mxf->metadata_sets)) - return AVERROR(ENOMEM); - tmp = av_realloc(mxf->metadata_sets, (mxf->metadata_sets_count + 1) * sizeof(*mxf->metadata_sets)); + + tmp = av_realloc_array(mxf->metadata_sets, mxf->metadata_sets_count + 1, sizeof(*mxf->metadata_sets)); if (!tmp) return AVERROR(ENOMEM); mxf->metadata_sets = tmp; |