Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues 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>
pull/371/head
Andreas Rheinhardt 4 years ago
parent 723ebf029a
commit 2f056def65
1 changed files with 11 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      libavfilter/dnn/dnn_backend_native_layer_mathbinary.c

23
libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
Unescape 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)
{
DnnLayerMathBinaryParams *params;
DnnLayerMathBinaryParams params = { 0 };
int dnn_size = 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;
params->input0_broadcast = (int32_t)avio_rl32(model_file_context);
params.input0_broadcast = (int32_t)avio_rl32(model_file_context);
dnn_size += 4;
if (params->input0_broadcast) {
params->v = av_int2float(avio_rl32(model_file_context));
if (params.input0_broadcast) {
params.v = av_int2float(avio_rl32(model_file_context));
} else {
layer->input_operand_indexes[input_index] = (int32_t)avio_rl32(model_file_context);
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;
params->input1_broadcast = (int32_t)avio_rl32(model_file_context);
params.input1_broadcast = (int32_t)avio_rl32(model_file_context);
dnn_size += 4;
if (params->input1_broadcast) {
params->v = av_int2float(avio_rl32(model_file_context));
if (params.input1_broadcast) {
params.v = av_int2float(avio_rl32(model_file_context));
} else {
layer->input_operand_indexes[input_index] = (int32_t)avio_rl32(model_file_context);
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);
dnn_size += 4;
layer->params = params;
if (layer->output_operand_index >= operands_num) {
return 0;
}
layer->params = av_memdup(&params, sizeof(params));
if (!layer->params)
return 0;
return dnn_size;
}

Write Preview
Loading…
Cancel
Save