diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-10 17:22:29 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-11 13:06:32 +0100 |
| commit | 508d7005a00ea0d047834d661109c57a1bacef53 (patch) | |
| tree | 7d10a94e6f5f7174cfe4556e8c2f5b81a5e877aa | |
| parent | 16e36d5c0cb9573b10cbbc5c40aaec58d4a340e7 (diff) | |
| download | ffmpeg-508d7005a00ea0d047834d661109c57a1bacef53.tar.gz | |
dnn/dnn_backend_native_layer_conv2d: Fix memleak on error
If an error happens when preparing the output data buffer, an already
allocated array would leak. Fix this by postponing its allocation.
Fixes Coverity issue #1473531.
Reviewed-by: Guo, Yejun <yejun.guo@intel.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavfilter/dnn/dnn_backend_native_layer_conv2d.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c index 61e5628843..1306ae42fc 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c +++ b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c @@ -191,7 +191,7 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera int thread_num = (ctx->options.conv2d_threads <= 0 || ctx->options.conv2d_threads > av_cpu_count()) ? (av_cpu_count() + 1) : (ctx->options.conv2d_threads); int thread_stride; - ThreadParam **thread_param = av_malloc_array(thread_num, sizeof(*thread_param)); + ThreadParam **thread_param; #else ThreadParam thread_param = { 0 }; #endif @@ -227,6 +227,7 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera thread_common_param.ctx = ctx; #if HAVE_PTHREAD_CANCEL + thread_param = av_malloc_array(thread_num, sizeof(*thread_param)); thread_stride = (height - pad_size * 2) / thread_num; //create threads for (int i = 0; i < thread_num; i++){ |