From patchwork Sun Mar 25 12:42:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Fernando X-Patchwork-Id: 8154 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2469395jad; Sun, 25 Mar 2018 05:43:16 -0700 (PDT) X-Google-Smtp-Source: AG47ELus0TahJLmWsoN04cJJiKdnqj2PTWFQ3BC+btouNspiKAg31RlpPs7sJ1caHt+zJYDDtJYu X-Received: by 10.223.158.137 with SMTP id a9mr16045836wrf.54.1521981796851; Sun, 25 Mar 2018 05:43:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521981796; cv=none; d=google.com; s=arc-20160816; b=E0Mipg++uy6HmjHhOQATjZqvV7W+BVZa7tIIesjB/3v2ZEMKhT7ONztjV+RRu7dUWd 0Q3js8cil3ofpyEyDPGxt/gpdzFv5NY3SfouzZPmQM3ILJwV3cAueHAkd6FNDU5ovRD2 ZTDURyMyvWrcxSYR7KiSkFNyt5A77ZaLXi0eKkWE8UjZkvU/NhVJ/9tB+PO7Za14G6Py 1hLQgwPYGkwDpTNz7YG57Rdu4xY3ptW4RbRXrvHosNuV0zU2kJfee9M+PqH4JIWHKS8w yGWy+GbUcsn4fDa8wOkG7mdDUxlhGAS47Ca03BUEmyrrVqRGy/UmIJGW+eF3ncl1xAnV 8GqQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=lHGhAncy9hF6uv85j2WHpJGtIEi91p3wxmsCAXod+5Q=; b=VzKxlTBRaBrQ1YadrS79UNDUlaSYGX0YFE3dtIcjfo2keQ0CdyxqjoAE03e+sfVEsT UARxHBxyMPoNbM23Ovu/O8ZYKukNGkLpnZjy4s0nymFcT/3UFmKq4+Hrd0PjvhtPW5+1 nQ4pLf/ljmRU1yiOrZ76VbahBrwsjfIS6Eu/qJtN2QpFc/ZV1Y+gECfg3QOWNuA/fUI2 DK8QuyUbqD2t2ZLcZ4wdAK1TI4J/fqIJ768g26Bk1AxxU9cpCikQVEbNsJqZNcSgqj73 aZVc/9FPtF3lVcXdd9zkVhP9EmLmQqJNyQKFimEyVIThUOO2PLndn45V0cPZPKmYe1pL FBgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QnpSgFwL; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 1si3173107wmv.251.2018.03.25.05.43.16; Sun, 25 Mar 2018 05:43:16 -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=@gmail.com header.s=20161025 header.b=QnpSgFwL; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6FC4A680A1F; Sun, 25 Mar 2018 15:42:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f43.google.com (mail-pg0-f43.google.com [74.125.83.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8F74680758 for ; Sun, 25 Mar 2018 15:42:51 +0300 (EEST) Received: by mail-pg0-f43.google.com with SMTP id m15so6277946pgc.1 for ; Sun, 25 Mar 2018 05:43:08 -0700 (PDT) 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; bh=wBu1dnls2NLBVBZZbRPLYjC1caCIDST8cBbeXlmwP3E=; b=QnpSgFwLkaiaTbrvggGdGMKIjBwFao/XzKwUoc9kqO7XoaDIau9etOnHeByRdOMJyi je7RQSCIAeTC8+Ez0f/+przQp6Bs7qUba4cT7KACR7Fsv21mfw5vAVB+zcxS7U2Z4JTQ p3hy9s6E8UJC+Mitzzx7kGYYWj+kr8DCO1BlMUe+Td86bp9nEJz+6iUbC4d/OPD9MD+e lEm1SEgnneJvWzgsLgXYOL8oUQMj58I3zvXQs7kuQj9GTubRwiWzIsbZQyFoAAbuSiho 2rLc6yNOMSz4pvOQtjYD2SyQfAghkxpDqpGEWLxsR0ebl4ku/CBqM4m6hX0B6RIfVKcR hUXQ== 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; bh=wBu1dnls2NLBVBZZbRPLYjC1caCIDST8cBbeXlmwP3E=; b=nBeGbR6dlCr2++wc+d5UiAzDkUvmIe+y0H3/08bvsB/VSWX4inkNFmAa4+Z4YjBJwl d5685Gs1qJkioG6bvUBydxtLmMjyWNlSYFM/nCH3PEe84al8836vgerG0FLfl6QVptBr Qg44acPaYf1hSc/LHzS2F6swqc31sopCwmPmF92Yog3i1qsKHI+6bMgxoCWfE5P7gMDb +sujKCdhohvLZeoDwH+ZPBoEZ/S8Nhax5giNFVKE251+a3YNbMSPpq1Cv6sox1vRsx89 Jg3xb8eGbd7eqaEhDmzXpyUOC0fuJ4zUdS+eaKaXtZuPfhnDe93ic1FlUMeLC+4xpPZv 6acw== X-Gm-Message-State: AElRT7F6uJJ6zj6qE60k+b3JqaEaU71OLGNfiBCnbJX65oFsoptqF3oA PDYA1NLpiutuvllv6PTmUDFcFPrP X-Received: by 10.99.124.2 with SMTP id x2mr26183343pgc.262.1521981786595; Sun, 25 Mar 2018 05:43:06 -0700 (PDT) Received: from localhost.localdomain (n175-33-166-6.meb2.vic.optusnet.com.au. [175.33.166.6]) by smtp.googlemail.com with ESMTPSA id e187sm27826551pfc.60.2018.03.25.05.43.04 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 25 Mar 2018 05:43:06 -0700 (PDT) From: dylanf123@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Mar 2018 23:42:53 +1100 Message-Id: <20180325124253.36091-1-dylanf123@gmail.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] avfilter/vf_avgblur_opencl: fix error when clSetKernelArg 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: drfer3 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: drfer3 Fixes Coverity CID 1430382 --- libavfilter/vf_avgblur_opencl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/vf_avgblur_opencl.c b/libavfilter/vf_avgblur_opencl.c index 5ee66c0ba2..09caa1fd4f 100644 --- a/libavfilter/vf_avgblur_opencl.c +++ b/libavfilter/vf_avgblur_opencl.c @@ -155,18 +155,21 @@ static int avgblur_opencl_filter_frame(AVFilterLink *inlink, AVFrame *input) if (cle != CL_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set kernel " "destination image argument: %d.\n", cle); + err = -1; goto fail; } cle = clSetKernelArg(ctx->kernel_horiz, 1, sizeof(cl_mem), &src); if (cle != CL_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set kernel " "source image argument: %d.\n", cle); + err = -1; goto fail; } cle = clSetKernelArg(ctx->kernel_horiz, 2, sizeof(cl_int), &radius_x); if (cle != CL_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set kernel " "sizeX argument: %d.\n", cle); + err = -1; goto fail; } @@ -191,18 +194,21 @@ static int avgblur_opencl_filter_frame(AVFilterLink *inlink, AVFrame *input) if (cle != CL_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set kernel " "destination image argument: %d.\n", cle); + err = -1; goto fail; } cle = clSetKernelArg(ctx->kernel_vert, 1, sizeof(cl_mem), &inter); if (cle != CL_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set kernel " "source image argument: %d.\n", cle); + err = -1; goto fail; } cle = clSetKernelArg(ctx->kernel_vert, 2, sizeof(cl_int), &radius_y); if (cle != CL_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set kernel " "sizeY argument: %d.\n", cle); + err = -1; goto fail; }