From owner-svn-src-all@freebsd.org  Tue Jan 16 20:35:55 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2276EB6EA9;
 Tue, 16 Jan 2018 20:35:55 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id BA8016BD3E;
 Tue, 16 Jan 2018 20:35:55 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2D00256F9;
 Tue, 16 Jan 2018 20:35:54 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0GKZs06056976;
 Tue, 16 Jan 2018 20:35:54 GMT (envelope-from tsoome@FreeBSD.org)
Received: (from tsoome@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0GKZsaV056975;
 Tue, 16 Jan 2018 20:35:54 GMT (envelope-from tsoome@FreeBSD.org)
Message-Id: <201801162035.w0GKZsaV056975@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tsoome set sender to
 tsoome@FreeBSD.org using -f
From: Toomas Soome <tsoome@FreeBSD.org>
Date: Tue, 16 Jan 2018 20:35:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r328061 - head/stand/efi/libefi
X-SVN-Group: head
X-SVN-Commit-Author: tsoome
X-SVN-Commit-Paths: head/stand/efi/libefi
X-SVN-Commit-Revision: 328061
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jan 2018 20:35:56 -0000

Author: tsoome
Date: Tue Jan 16 20:35:54 2018
New Revision: 328061
URL: https://svnweb.freebsd.org/changeset/base/328061

Log:
  utf8_to_ucs2() should check for malloc failure
  
  utf8_to_ucs2() is calling malloc() without checking the result.
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D13933

Modified:
  head/stand/efi/libefi/efichar.c

Modified: head/stand/efi/libefi/efichar.c
==============================================================================
--- head/stand/efi/libefi/efichar.c	Tue Jan 16 20:14:31 2018	(r328060)
+++ head/stand/efi/libefi/efichar.c	Tue Jan 16 20:35:54 2018	(r328061)
@@ -139,6 +139,8 @@ utf8_to_ucs2(const char *name, efi_char **nmp, size_t 
 	sz = strlen(name) * 2 + 2;
 	if (*nmp == NULL)
 		*nmp = malloc(sz);
+	if (*nmp == NULL)
+		return (ENOMEM);
 	nm = *nmp;
 	*len = sz;