Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'

* commit '8a9641a652ed1546fedfda22584f79d3d423096e':
  bsf: check memory allocations

Conflicts:
	libavcodec/noise_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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;
         }
     }