On Wed, 8 Jan 2014 03:25:35 +0100, Luca Barbato <[email protected]> wrote: > --- > libavformat/mxfdec.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c > index e22b92a..c51841f 100644 > --- a/libavformat/mxfdec.c > +++ b/libavformat/mxfdec.c > @@ -1234,9 +1234,9 @@ static int mxf_compute_index_tables(MXFContext *mxf) > } > } > > - if (mxf->nb_index_tables > INT_MAX / sizeof(MXFIndexTable) || > - !(mxf->index_tables = av_mallocz(mxf->nb_index_tables * > - sizeof(MXFIndexTable)))) { > + mxf->index_tables = av_mallocz_array(mxf->nb_index_tables, > + sizeof(MXFIndexTable)); > + if (!mxf->index_tables) { > av_log(mxf->fc, AV_LOG_ERROR, "failed to allocate index tables\n"); > ret = AVERROR(ENOMEM); > goto finish_decoding_index; > @@ -1255,10 +1255,10 @@ static int mxf_compute_index_tables(MXFContext *mxf) > for (i = j = 0; j < mxf->nb_index_tables; i += > mxf->index_tables[j++].nb_segments) { > MXFIndexTable *t = &mxf->index_tables[j]; > > - if (t->nb_segments > > - (INT_MAX / sizeof(MXFIndexTableSegment *)) || > - !(t->segments = av_mallocz(t->nb_segments * > - sizeof(MXFIndexTableSegment*)))) { > + t->segments = av_mallocz_array(t->nb_segments, > + sizeof(MXFIndexTableSegment*)); > + > + if (!t->segments) { > av_log(mxf->fc, AV_LOG_ERROR, "failed to allocate > IndexTableSegment" > " pointer array\n"); > ret = AVERROR(ENOMEM); > -- > 1.8.5.1 >
Fine with me. (might make it sizeof(*ptr) instead of sizeof(type) while at it) -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
