From patchwork Thu Jan 12 05:31:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 2191 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1117515vsb; Wed, 11 Jan 2017 21:31:35 -0800 (PST) X-Received: by 10.194.177.231 with SMTP id ct7mr7396309wjc.221.1484199095358; Wed, 11 Jan 2017 21:31:35 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 187si845700wmx.141.2017.01.11.21.31.34; Wed, 11 Jan 2017 21:31:35 -0800 (PST) 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 71D0E68A26F; Thu, 12 Jan 2017 07:31:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADAB468A252 for ; Thu, 12 Jan 2017 07:31:15 +0200 (EET) X-QQ-mid: bizesmtp2t1484199066ta82wgico Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Thu, 12 Jan 2017 13:31:05 +0800 (CST) X-QQ-SSF: 01100000002000F0F721000A0000000 X-QQ-FEAT: 9NFkmNiL4hf4SN5r7rgc2kHsbNCTf592dNWuVZAq7X03f0Vfw6xfHCAMaoWTo MtTJsK8lDHLsljyz8cp4RUk7XwXsMs9vdEbwPJhj5Wx9Y7Woc6em2r+R9HmVdVT2IbXgmDf 8PCfN9ld33aowmLVh4j/ik/VoO72DOM/SL1AjymJ49tb6jSZ15snduWgAvwmqwP0u0jnkn0 NRxWWuVGN7K1k3uVt6M9jmwcLWX7KdXmWKddwfa3nAHvfRIqwHJOG6CYcTyFDpXA1PMkwGL 0zQu/G5jU1XISA X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Jan 2017 13:31:04 +0800 Message-Id: <20170112053104.18172-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] cmdutils_opencl: fix resource_leak cid 1396852 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" CID: 1396852 check the devices_list alloc status, and release the devices_list when alloc devices error Signed-off-by: Steven Liu --- cmdutils_opencl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmdutils_opencl.c b/cmdutils_opencl.c index dd21344..655d1c9 100644 --- a/cmdutils_opencl.c +++ b/cmdutils_opencl.c @@ -213,22 +213,27 @@ static int compare_ocl_device_desc(const void *a, const void *b) int opt_opencl_bench(void *optctx, const char *opt, const char *arg) { - int i, j, nb_devices = 0, count = 0; + int i, j, nb_devices = 0, count = 0, ret = 0; int64_t score = 0; AVOpenCLDeviceList *device_list; AVOpenCLDeviceNode *device_node = NULL; OpenCLDeviceBenchmark *devices = NULL; cl_platform_id platform; - av_opencl_get_device_list(&device_list); + ret = av_opencl_get_device_list(&device_list); + if (ret < 0) { + return ret; + } for (i = 0; i < device_list->platform_num; i++) nb_devices += device_list->platform_node[i]->device_num; if (!nb_devices) { av_log(NULL, AV_LOG_ERROR, "No OpenCL device detected!\n"); + av_opencl_free_device_list(&device_list); return AVERROR(EINVAL); } if (!(devices = av_malloc_array(nb_devices, sizeof(OpenCLDeviceBenchmark)))) { av_log(NULL, AV_LOG_ERROR, "Could not allocate buffer\n"); + av_opencl_free_device_list(&device_list); return AVERROR(ENOMEM); }