From patchwork Fri Jun 8 16:31:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 9325 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1077393jad; Fri, 8 Jun 2018 09:31:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLygNP8kkot6458qctBozzCuxWR7E3xq82M3gg2vEjrxYEPnIF0fhAX/WVADU7YCyV479mn X-Received: by 2002:adf:d250:: with SMTP id o16-v6mr5398018wri.59.1528475485727; Fri, 08 Jun 2018 09:31:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528475485; cv=none; d=google.com; s=arc-20160816; b=I8E9CQx5IIxMwu5cnM0pVKocYLIajNglKnS4hyZQTLB3do93ldpzCdKg/4a+gD5AOu j5LLxXy2PuQD0B5vV4O9uPTmp10d+PzMHj76cJ0rDDIxfH46A9ZsCjbxoWMWaHmBaU/b 0PX8b67ZXxTde8geZO9j3bYhiLDR62afGi+iHpq+vv6emvKO1zU4sOJ+j2jBIyyNHnIL WXkGYnyjpbU9f4esSKIFCx6P09auiHwYIA3iO/bIQedEmOUaNc5u8nJNRkbHTHbef9wj ZWjIzwZULiqeVrsc6eI9sqRMC9zMynjOWeaLp2un1a9lH9OtA+crWJPdipmxrSPlXU8D ZNTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=xqY7gIrfKYIGFpbvyJUbMZLk6NDWhT1V/DUkqF7N71o=; b=xhO1i19bdlIpbxrNGuzALBjKfZfyXnaMdYhfa09zpdDPMHRxUby9ufurbuM0rwuz45 lZNQocAZcdhV8ckO9KkwuP5M6Wr9D7j0fISmiEx8xmTXHpqooYDluz7WzMba7CAyhU+c O3YqvJ/jtQGCsDB0jhOrD5VoqUlkh+lhBEEh98HTIOheRM49H9r3RYOEKtKBe5/ajbj+ ZJxrGOhhghpDXaBFq1XHc6PB04ZRMZVy6RUH3NRN6HP2SqqWy9OrSYjmqfmhDQePdclD bnAyfM3iiRhdGun+BFeKLY5mpA/Z0htvQvq99Z7TxQ169h/Z+1iSx5jPq7ysk86sRz7A uhCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=VlEtGHnH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c6-v6si25480900wri.363.2018.06.08.09.31.24; Fri, 08 Jun 2018 09:31:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=VlEtGHnH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8783689CC2; Fri, 8 Jun 2018 19:30:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [5.9.118.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61731689BB5 for ; Fri, 8 Jun 2018 19:30:29 +0300 (EEST) Received: from localhost.localdomain (200116b86443aa000c2e47edf794c518.dip.versatel-1u1.de [IPv6:2001:16b8:6443:aa00:c2e:47ed:f794:c518]) by btbn.de (Postfix) with ESMTPSA id B9C0C315E57; Fri, 8 Jun 2018 18:31:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1528475476; bh=9Ki57IuF9JaXzcXjUOTGxjVuDjSELTWLpJfte/LZPUk=; h=From:To:Cc:Subject:Date; b=VlEtGHnHXLqLszhcy7LQMZNPvHvzDv+tqwbGuSQh8kJzrXMGsA9U91jUoFtm8BFfH aJyHR+zx/RofZDNGuJuVa+4AwHNX/q4p2rO0FihITzHbTM4w3XftMMOJqQRh1WM4Pb pkJpRuoKKeCCXf9ssD1t26L9aZjbjlMCTG70AkAFBNCK6IC4Ox5YM87fJFQ1DaHQRW fuJ3srGkASg0gq+P+tL99lMF6fuymOlERlXy4MtJ0+WToOfrJGaP+1S7/1DPnQucCd txaZCqOCbBR5ZdOTM6S1PkRfLg8B+qza0Iuugn0FTaYrPIwjrDKXSGR/uwesQGlRp0 hBicQarLL/4nQ== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 18:31:07 +0200 Message-Id: <20180608163107.3112-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] avfilter/dnn_backend_native: fix leaks in error paths 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: Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes CID #1435888 --- libavfilter/dnn_backend_native.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/dnn_backend_native.c b/libavfilter/dnn_backend_native.c index 6e80dd3663..e0a9ec5003 100644 --- a/libavfilter/dnn_backend_native.c +++ b/libavfilter/dnn_backend_native.c @@ -172,6 +172,7 @@ DNNModel* ff_dnn_load_model_native(const char* model_filename) conv_params->output_num <= 0 || conv_params->kernel_size <= 0){ avio_closep(&model_file_context); ff_dnn_free_model_native(&model); + av_freep(&conv_params); return NULL; } conv_params->kernel = av_malloc(kernel_size * sizeof(float)); @@ -179,6 +180,9 @@ DNNModel* ff_dnn_load_model_native(const char* model_filename) if (!conv_params->kernel || !conv_params->biases){ avio_closep(&model_file_context); ff_dnn_free_model_native(&model); + av_freep(&conv_params->kernel); + av_freep(&conv_params->biases); + av_freep(&conv_params); return NULL; } for (i = 0; i < kernel_size; ++i){