diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 15:47:12 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 15:47:12 +0300 |
commit | c5eb725fd33ee705c3c7d674ae65bbb717bf7207 (patch) | |
tree | 27998b149b222fdb19fd20fd78b7365a7f1b731a /libavcodec/bitstream_filter.c | |
parent | 9fb5a91c66934dab395ff32eb524a3dbe08b53d8 (diff) | |
parent | 8a9641a652ed1546fedfda22584f79d3d423096e (diff) |
Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'
* commit '8a9641a652ed1546fedfda22584f79d3d423096e':
bsf: check memory allocations
Conflicts:
libavcodec/noise_bsf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bitstream_filter.c')
-rw-r--r-- | libavcodec/bitstream_filter.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/bitstream_filter.c b/libavcodec/bitstream_filter.c index 3275326db4..a4e437df5f 100644 --- a/libavcodec/bitstream_filter.c +++ b/libavcodec/bitstream_filter.c @@ -49,9 +49,17 @@ AVBitStreamFilterContext *av_bitstream_filter_init(const char *name) if (!strcmp(name, bsf->name)) { AVBitStreamFilterContext *bsfc = av_mallocz(sizeof(AVBitStreamFilterContext)); + if (!bsfc) + return NULL; bsfc->filter = bsf; - bsfc->priv_data = - bsf->priv_data_size ? av_mallocz(bsf->priv_data_size) : NULL; + bsfc->priv_data = NULL; + if (bsf->priv_data_size) { + bsfc->priv_data = av_mallocz(bsf->priv_data_size); + if (!bsfc->priv_data) { + av_freep(&bsfc); + return NULL; + } + } return bsfc; } } |