generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mxf: Use av_malloc_array

Browse Source
This commit is contained in:
Luca Barbato
2014-01-07 23:54:09 +01:00
parent f5fbbbc022
commit 1a4e4ad0e0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/mxfdec.c
View File

@@ -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_array(mxf->nb_index_tables,
!(mxf->index_tables = av_mallocz(mxf->nb_index_tables * sizeof(*mxf->index_tables));
sizeof(MXFIndexTable)))) { if (!mxf->index_tables) {
av_log(mxf->fc, AV_LOG_ERROR, "failed to allocate index tables\n"); av_log(mxf->fc, AV_LOG_ERROR, "failed to allocate index tables\n");
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto finish_decoding_index; 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) { for (i = j = 0; j < mxf->nb_index_tables; i += mxf->index_tables[j++].nb_segments) {
MXFIndexTable *t = &mxf->index_tables[j]; MXFIndexTable *t = &mxf->index_tables[j];
if (t->nb_segments > t->segments = av_mallocz_array(t->nb_segments,
(INT_MAX / sizeof(MXFIndexTableSegment *)) || sizeof(*t->segments));
!(t->segments = av_mallocz(t->nb_segments *
sizeof(MXFIndexTableSegment*)))) { if (!t->segments) {
av_log(mxf->fc, AV_LOG_ERROR, "failed to allocate IndexTableSegment" av_log(mxf->fc, AV_LOG_ERROR, "failed to allocate IndexTableSegment"
" pointer array\n"); " pointer array\n");
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);