From patchwork Wed Mar 10 21:54:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26324 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3B95A44B799 for ; Wed, 10 Mar 2021 23:55:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2896668AB46; Wed, 10 Mar 2021 23:55:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB9B168AB32 for ; Wed, 10 Mar 2021 23:55:42 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id d13so64492edp.4 for ; Wed, 10 Mar 2021 13:55:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=qy5bAWiTjMwlHFtKI/qaVBFBUIVyuVbTRekWCgGhPVs=; b=SYdR+z6I8QIftN5G2uDDWFPzL80bNDBfs91GYjIV/YBsin9gNZBtsDBk/5gzSaqJVW /r71lrnrrNcZli6mW5HN4Y2g6p9/Z4OR/vKO11M75wbFAtjBOh2qPC1x6nfnzwF6LHQk FTeXRIWhvwAtM7hCjredemDJ28SNHMnu4j7Eq3JT1Pnyg6ye43r0kC1SdsLFSW3p/Z2E n+v7+W7o2OeCuF9G34qEhWW1U7P54uLw+UPDoGYpQ2t/HTDsfgC0vAhAivG+O62xpSq+ hzQ08yFSn7c+WYEJCrmCyHHXpxR3+XXoGdsvGhuXXvX5qgre8PVlLPZrK0UYiqM4ffOB m4VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=qy5bAWiTjMwlHFtKI/qaVBFBUIVyuVbTRekWCgGhPVs=; b=p/teoncMqMfoRe49ZApxpO4zf4LT5nOHKbk52LXAT0OXXMsqadzlG19EwhdG8YKT0M 6FhsnAcz4t6fpEkT9incObFZv5/0IAPL1pWrSKPDFZKmsprSaEH9VFTVfew7+ZReTn1y yUQsXGO0Ko8H1mt0+oFjgB7mqw9h54ee1RSwrnsehaml18bvcwUM+GZT/6F19knfBrlZ p5k+yqYULy3lsEzINsOGsV/HsCewGYc5/WhTRyommpy45/3hKNnI+6gcYu9V0DG52ikk F29XtL1DBBZpPtWTDItOWHaUJWRvtOAmHm/O7eA0uVje51Ts1OPTUEfyD9RYtWx8MMY1 2ASQ== X-Gm-Message-State: AOAM533/hpKj/uVmOFTS7oWNUkxd88h2GzKKxDgQQKvdCEeSdXXg1+L1 W3svRm2JrJd8Thh6hgxn0u9etgelfAQ= X-Google-Smtp-Source: ABdhPJzQZtGHxjMTcHZvRnFN8JhYFXFlj8AUTt7wWiQNwiJRGdVE/n31F1wAhkMTuc1Qs7QbEC+N5A== X-Received: by 2002:a05:6402:1c98:: with SMTP id cy24mr5514026edb.296.1615413342044; Wed, 10 Mar 2021 13:55:42 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id m10sm351993ejx.10.2021.03.10.13.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 13:55:41 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Mar 2021 22:54:45 +0100 Message-Id: <20210310215446.1396386-13-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210310010601.1142819-1-andreas.rheinhardt@gmail.com> References: <20210310010601.1142819-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/23] dnn/dnn_backend_native_layer_mathbinary: Fix leak upon error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes Coverity issue #1473568. Signed-off-by: Andreas Rheinhardt --- .../dnn/dnn_backend_native_layer_mathbinary.c | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c index c116188bab..1c33b4633d 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c +++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c @@ -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(¶ms, sizeof(params)); + if (!layer->params) + return 0; return dnn_size; }