From patchwork Sat Mar 17 12:28:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 8021 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp603754jad; Sat, 17 Mar 2018 05:28:43 -0700 (PDT) X-Google-Smtp-Source: AG47ELthMyc1Q+6kbCre+lVbqEI3+/wmASDJCHjSA1RJGoT3CzAJmJR0elVxdZf9PQMi1f61qlb4 X-Received: by 10.28.71.67 with SMTP id u64mr4453395wma.76.1521289723623; Sat, 17 Mar 2018 05:28:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521289723; cv=none; d=google.com; s=arc-20160816; b=V6nFhH2eXRT21CtD3WCiV0NlBaapx+PEYoPVu5pydTGxACrAZRKO143rAoQI6qya0q k50FnTblaQYHhY/fjiJKgLVIJ626XmEZAAPwWiHA/MN6re7ES4mnJFds5TOFzZhIyAX6 dXEuhoXsD17xwTeWmNi8eqgW3JOCiLyHTf69eWbdtFy4sG3R211iVlVKD+xOstOt86xg i9gvCO51xtBqLJIbIj38hryWqL4eF7tDTSGpKC3jhu68vZc8BGYs9dFd8JfV0qxm3bYh 6RfAn5/Wz+6WNNDQOmc0UIvzKLE1LnUgSejRBh7HTouFMdebAqNHZpPxzzH+sL45KL37 eBuw== 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:delivered-to :arc-authentication-results; bh=R/RRX8pWpMiwPp3EuZ8TC2Rvptt0S9VNKqiev8uQUDw=; b=Ro/9YmkFbU4ioCRPrLaeDevrNEy513d0xGhP2hHXSNAgmHQxUl0Eh4hhUGkecaZ1iR UX5+0vxyHn6AJnhMiE6yPPnK1/bMqHu/b+rWYZj7FhPf0l3hEzM0lp19x8ZNms5O8bhz Q1QD6kh0KQ4kyLM4w9LwUUxgWFaN63jLSX7sP9y+8psxex+/M4k7qlQEV084+/f6FbuO O7THVmGMW9H+7fsCE+cl8ZjuA5umMlzwkS6qIcUkdwXJRl4wmkHaL5slWuo0cggvECf8 hBAG92BQPJFZsghxwC9hU8d2ghrM1MrNM7ZUDovlcbznY59DWNmZgSKcfzIEA0LQhEGg t7yg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r17si1023094wrg.64.2018.03.17.05.28.42; Sat, 17 Mar 2018 05:28:43 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2553E6898A7; Sat, 17 Mar 2018 14:28:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 507196882A3 for ; Sat, 17 Mar 2018 14:28:22 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 1BAB1E11C6; Sat, 17 Mar 2018 13:28:35 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YVIBBqMSbith; Sat, 17 Mar 2018 13:28:34 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 9D094E11C5; Sat, 17 Mar 2018 13:28:33 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Mar 2018 13:28:28 +0100 Message-Id: <20180317122828.23220-1-cus@passwd.hu> X-Mailer: git-send-email 2.13.6 Subject: [FFmpeg-devel] [PATCH] avdevice/decklink: fix leak when listing devices and there is no memory 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes Coverity CID 1419523. Signed-off-by: Marton Balint --- libavdevice/decklink_common.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index da414ed5f8..b889033cf8 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -322,21 +322,14 @@ int ff_decklink_list_devices(AVFormatContext *avctx, ret = AVERROR(ENOMEM); goto next; } - new_device->device_name = av_strdup(displayName); - if (!new_device->device_name) { - ret = AVERROR(ENOMEM); - goto next; - } + new_device->device_name = av_strdup(displayName); new_device->device_description = av_strdup(displayName); - if (!new_device->device_description) { - av_freep(&new_device->device_name); - ret = AVERROR(ENOMEM); - goto next; - } - if ((ret = av_dynarray_add_nofree(&device_list->devices, - &device_list->nb_devices, new_device)) < 0) { + if (!new_device->device_name || + !new_device->device_description || + av_dynarray_add_nofree(&device_list->devices, &device_list->nb_devices, new_device) < 0) { + ret = AVERROR(ENOMEM); av_freep(&new_device->device_name); av_freep(&new_device->device_description); av_freep(&new_device);