From patchwork Wed Mar 10 21:54:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26320 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 417BC44B799 for ; Wed, 10 Mar 2021 23:55:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1542268AB2C; Wed, 10 Mar 2021 23:55:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A63468AAEB for ; Wed, 10 Mar 2021 23:55:35 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id dm26so4473edb.12 for ; Wed, 10 Mar 2021 13:55:35 -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=GTnyDLxg3nBelwGY9R+6xNjxri5Ql0TxpH1NDxYY/W8=; b=JBJcnbfPMee9GskwzZKTAEwZpvBmdfnnqdYRgm+Xq9zWc2QTBb257Z2rx/CCvW3qnd Ki9lYgNbIEBferjEfm9knMM9ZufmZKeuSl3LBX2C/ANX1ueCW21MfeLcTDRV9ltT2J8G cHxPaL81XbfvQT8tSmA6iG1UOTuGdXcHlz0Y5KPKv96yqY0ItSUdavFFGxTjdo1f8qeM xu1J8gYz3h1LgOrhHGLkIeuSGDJsoH0kx7wI0ffEjMOJz8/rkZzsZ7O57DXG5U6WmRJe ekbDYszp3qdqj8KCnEk81CX2aNIN818cjjZm0gE8GyGvHDfahjiocigcJp/QQserp5Qf XoVg== 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=GTnyDLxg3nBelwGY9R+6xNjxri5Ql0TxpH1NDxYY/W8=; b=rgZ2uRNnCTtH0OAllTBkgvYDGTHe5vU+gfoLIzWBJ8aIYDbq5r2pvlVEBwRV3J3V6E 0tRdfYihy3S5dLiWvuPo4peMH2LmMfPQ0xnTpWoZD/tEBpuAmXsI3WosZQ9L5WvDhV4T nHR1n+3UtQjPt2Yq9X5PEkVgWOlGmjwprELyrBIGtvt5G3omDXddnSz9oF6N/5U8h2zL HEtZqwOye8E+K1y5ZWeEEIoceJkUkF0FOLrz1XzhlS3KHKse5FoX8vy8DZ+Hm5gZ0yHI S05Zo2UWBhCJak96kX1Ffc5msEvd5H+OwsYMRk3iTOxU2LxHj9kj1IjGxdLVgYiQem9C zXxg== X-Gm-Message-State: AOAM530KNNKO/Sj2aufg18Ee/aXlcnYlVvvgAEnjh6WiD8+E3hoIgh9H 5h+iF7mwwy32Xh5YJQx3mP/DkAZS7Lo= X-Google-Smtp-Source: ABdhPJyN0L7Bm2x2NTLt6K8dNHIGhOr/u3tfnv9xDfpUEBm4Xct1tb2QFPN8RMCb70NaPKWIMzuEJg== X-Received: by 2002:a05:6402:1d95:: with SMTP id dk21mr5475348edb.280.1615413334947; Wed, 10 Mar 2021 13:55:34 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 13:55:34 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Mar 2021 22:54:34 +0100 Message-Id: <20210310215446.1396386-2-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 11/23] dnn/dnn_backend_native: Fix leak in case parsing options fails 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" Signed-off-by: Andreas Rheinhardt --- libavfilter/dnn/dnn_backend_native.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_native.c b/libavfilter/dnn/dnn_backend_native.c index 5336cd765a..fd1f9e299d 100644 --- a/libavfilter/dnn/dnn_backend_native.c +++ b/libavfilter/dnn/dnn_backend_native.c @@ -157,12 +157,12 @@ DNNModel *ff_dnn_load_model_native(const char *model_filename, DNNFunctionType f if (!native_model){ goto fail; } + model->model = native_model; native_model->ctx.class = &dnn_native_class; model->options = options; if (av_opt_set_from_string(&native_model->ctx, model->options, NULL, "=", "&") < 0) goto fail; - model->model = (void *)native_model; native_model->model = model; #if !HAVE_PTHREAD_CANCEL