[FFmpeg-cvslog] mxf: Drop unnecessary checks

Luca Barbato git at videolan.org
Tue Jan 14 22:13:21 CET 2014


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Tue Jan  7 21:56:33 2014 +0100| [f5fbbbc022f723d3ccf99afd5d658a977b51c08a] | committer: Luca Barbato

mxf: Drop unnecessary checks

av_reallocp_array does the check already.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5fbbbc022f723d3ccf99afd5d658a977b51c08a
---

 libavformat/mxfdec.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 3299e16..2734e14 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -418,9 +418,6 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size
     uint32_t nb_essence_containers;
     int err;
 
-    if (mxf->partitions_count+1 >= UINT_MAX / sizeof(*mxf->partitions))
-        return AVERROR(ENOMEM);
-
     if ((err = av_reallocp_array(&mxf->partitions, mxf->partitions_count + 1,
                                  sizeof(*mxf->partitions))) < 0) {
         mxf->partitions_count = 0;
@@ -552,8 +549,6 @@ static int mxf_add_metadata_set(MXFContext *mxf, void *metadata_set)
 {
     int err;
 
-    if (mxf->metadata_sets_count+1 >= UINT_MAX / sizeof(*mxf->metadata_sets))
-        return AVERROR(ENOMEM);
     if ((err = av_reallocp_array(&mxf->metadata_sets, mxf->metadata_sets_count + 1,
                                  sizeof(*mxf->metadata_sets))) < 0) {
         mxf->metadata_sets_count = 0;



More information about the ffmpeg-cvslog mailing list