From patchwork Mon Dec 5 17:49:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Gu X-Patchwork-Id: 1681 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1759337vsa; Mon, 5 Dec 2016 10:06:22 -0800 (PST) X-Received: by 10.28.216.65 with SMTP id p62mr9973389wmg.92.1480961182517; Mon, 05 Dec 2016 10:06:22 -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 g142si1050698wmg.53.2016.12.05.10.06.21; Mon, 05 Dec 2016 10:06:22 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE 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 BD319689EAF; Mon, 5 Dec 2016 20:06:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 856E268975B for ; Mon, 5 Dec 2016 20:06:03 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id e9so17088579pgc.1 for ; Mon, 05 Dec 2016 10:06:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=H5nNmsUp7Q1FdiJe64AR8JUXMKXH/BUngH6mtfsG/Vc=; b=LHsAjWMQCgb8oyICeVc1SjQZlnCthw07noFRy0pmz6EGE7R73TiAq/3154sQlNF5wS jMlvWY5Z/QXyPGWVR283uDpexkJIxmDcm5BT8sRfjoHKMZysUfpUCINsZUlEX++vYx0z 6X6IMeF9zltCI6y3fRebIwZWHVQxW62ETDuNy6ZuL/Qat/7MiY+el7i2hwAQZkWGiOVk lwpEcI+E8MWfMl01xmPWLUUM6DgJDE4pqNYzBZxf5wQnr6Kkq8bWcEikiTHOWWcTFEO5 z80ftnbiaQZc89HL0qXigTAOeC/R7pD6G+BhkA81qfWoKSK5jrMmksAZZXlIuXvoq13w Mepg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=H5nNmsUp7Q1FdiJe64AR8JUXMKXH/BUngH6mtfsG/Vc=; b=T9DtuFlBxE7SPgGBJ9w3hgUcaHujBJgpgTnxJDq06T51qcxs/7IZaFJyiYpKA9/vu8 nu8C6Purop/4KaWlmTtx6xSWIkdV5n/KOKsv6LawaC3fAe8hUs5BwKC3oXVO3meOXWvU Hz4+LCINJWJcvlwe5AQYB1GCgh1a8c4zDW2Y5pF2AdikPEZLIAwRIkWZg61ztc6RhHI0 +gAEh/ajiNFyOqmGjR1nFUe2Br8NsJs6jORW1TQpi3xVttn/Bj3hdNMLZcigFex+Self xrN+CtHkbGSZ6qjpe+1EbMfqCrvIMaYvTe2wKsFUtqEP90K4E7xbjjoCdRj9UdGcleNJ A4fg== X-Gm-Message-State: AKaTC00zWBVgiUG8FjDONUeeUdrzsh5ziWeofqD+tPemgLW5px1dRA70QZiwPgeAKc8Ptw== X-Received: by 10.99.219.21 with SMTP id e21mr102948605pgg.136.1480960268745; Mon, 05 Dec 2016 09:51:08 -0800 (PST) Received: from localhost.localdomain (sylly.timothygu.me. [138.68.13.242]) by smtp.gmail.com with ESMTPSA id t21sm29055270pfa.1.2016.12.05.09.51.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Dec 2016 09:51:08 -0800 (PST) From: Timothy Gu To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Dec 2016 09:49:06 -0800 Message-Id: <20161205174906.9611-1-timothygu99@gmail.com> X-Mailer: git-send-email 2.10.2 Subject: [FFmpeg-devel] [PATCH] omx: Fix OOM check 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: Timothy Gu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also use av_mallocz_array(). Fixes CID1396839. --- libavcodec/omx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/omx.c b/libavcodec/omx.c index c1b6fb9..b5093f4 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -352,12 +352,12 @@ static av_cold int find_component(OMXContext *omx_context, void *logctx, av_log(logctx, AV_LOG_WARNING, "No component for role %s found\n", role); return AVERROR_ENCODER_NOT_FOUND; } - components = av_mallocz(sizeof(char*) * num); + components = av_mallocz_array(num, sizeof(*components)); if (!components) return AVERROR(ENOMEM); for (i = 0; i < num; i++) { components[i] = av_mallocz(OMX_MAX_STRINGNAME_SIZE); - if (!components) { + if (!components[i]) { ret = AVERROR(ENOMEM); goto end; }