highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnn/dnn_backend_native_layer_mathbinary: Fix leak upon error

Browse Source 
Fixes Coverity issue #1473568.

Reviewed-by: Guo, Yejun <yejun.guo@intel.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2021-03-10 18:45:07 +01:00
parent 723ebf029a
commit 2f056def65
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
View File

@@ -100,20 +100,17 @@ static void math_binary_not_commutative(FunType pfun, const DnnLayerMathBinaryPa
} }
int ff_dnn_load_layer_math_binary(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num) int ff_dnn_load_layer_math_binary(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num)
{ {
DnnLayerMathBinaryParams *params; DnnLayerMathBinaryParams params = { 0 };
int dnn_size = 0; int dnn_size = 0;
int input_index = 0; int input_index = 0;
params = av_malloc(sizeof(*params));
if (!params)
return 0;
params->bin_op = (int32_t)avio_rl32(model_file_context); params.bin_op = (int32_t)avio_rl32(model_file_context);
dnn_size += 4; dnn_size += 4;
params->input0_broadcast = (int32_t)avio_rl32(model_file_context); params.input0_broadcast = (int32_t)avio_rl32(model_file_context);
dnn_size += 4; dnn_size += 4;
if (params->input0_broadcast) { if (params.input0_broadcast) {
params->v = av_int2float(avio_rl32(model_file_context)); params.v = av_int2float(avio_rl32(model_file_context));
} else { } else {
layer->input_operand_indexes[input_index] = (int32_t)avio_rl32(model_file_context); layer->input_operand_indexes[input_index] = (int32_t)avio_rl32(model_file_context);
if (layer->input_operand_indexes[input_index] >= operands_num) { if (layer->input_operand_indexes[input_index] >= operands_num) {
@@ -123,10 +120,10 @@ int ff_dnn_load_layer_math_binary(Layer *layer, AVIOContext *model_file_context,
} }
dnn_size += 4; dnn_size += 4;
params->input1_broadcast = (int32_t)avio_rl32(model_file_context); params.input1_broadcast = (int32_t)avio_rl32(model_file_context);
dnn_size += 4; dnn_size += 4;
if (params->input1_broadcast) { if (params.input1_broadcast) {
params->v = av_int2float(avio_rl32(model_file_context)); params.v = av_int2float(avio_rl32(model_file_context));
} else { } else {
layer->input_operand_indexes[input_index] = (int32_t)avio_rl32(model_file_context); layer->input_operand_indexes[input_index] = (int32_t)avio_rl32(model_file_context);
if (layer->input_operand_indexes[input_index] >= operands_num) { if (layer->input_operand_indexes[input_index] >= operands_num) {
@@ -138,11 +135,13 @@ int ff_dnn_load_layer_math_binary(Layer *layer, AVIOContext *model_file_context,
layer->output_operand_index = (int32_t)avio_rl32(model_file_context); layer->output_operand_index = (int32_t)avio_rl32(model_file_context);
dnn_size += 4; dnn_size += 4;
layer->params = params;
if (layer->output_operand_index >= operands_num) { if (layer->output_operand_index >= operands_num) {
return 0; return 0;
} }
layer->params = av_memdup(&params, sizeof(params));
if (!layer->params)
return 0;
return dnn_size; return dnn_size;
} }