From nobody Thu Feb 03 02:49:39 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0256819A1170; Thu, 3 Feb 2022 02:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jq36W2VgCz4bKd; Thu, 3 Feb 2022 02:49:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643856579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2SoZIWCWmUOdi4mq/LRyChCLRhi8IVfkW65qyI2v1O0=; b=t+onSfY/Dw+I4qymHLwziwRFOaRR4LXqvcv+peRGnOELluzorT1fqdjv+ERovbrlVriGlQ DkPQYfoU5ICar+tGNqcMGbUPL0SLjO6VTX5GpMQ2wevfeTcvmMa3LA9cuXX0E5yzhgMrA2 nkpnQX5VZV/UgmtA6BiNvaxGPG9y6urfFLmPX5cxuQ0gpLUYk4oFfHNk3EIDWHX/+O6qbB 7n0iML1De2qjD8J58AMvkbGC7yKXxbs9CWfW5l+bvTuNvhSWgY4KJWgAAe9lA5jw8sV4b/ p3T5M7QbQVo+sLafKSyrYMU4jK4MgS8XRGHyfdnU1KKoAolk4USkp8yYc8u2KQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3052110082; Thu, 3 Feb 2022 02:49:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2132ndPT087247; Thu, 3 Feb 2022 02:49:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2132ndwf087246; Thu, 3 Feb 2022 02:49:39 GMT (envelope-from git) Date: Thu, 3 Feb 2022 02:49:39 GMT Message-Id: <202202030249.2132ndwf087246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ef061a2e2978 - main - __ctype_load(): check for calloc() failure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef061a2e2978a5e0fbfe2766ff7ab8f529bbd966 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643856579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2SoZIWCWmUOdi4mq/LRyChCLRhi8IVfkW65qyI2v1O0=; b=xVtjsgJa9ftlB4OqD9HCRRxagz/FLRikXvODzrbwhXbUH7tGirNI/ocNNXwyfX8q15PjNi HoPZ+oMVHZarcM6MsHfz+e4/P0hXXxcl+ratuh2ZCpcdrhbsXwxlkOkOqR+4AO8DvbCI9T e/dFwcY3mxl/XJazhdZVh025mFWbysN/y58LNHHA/Bcxy7PEEKLX3q94iY7CUXfH9EqaWI gpdgdCVf+YHPJHmwHnGs6WrLk0CQNKmWXyn9ayVXjYuoxKXlTAbtVE2JhVCpJTeilPks+P CcIfEvTfx9TWaGrEhyKbvhDpwFK2q0xLTlZhfCgh/t05IrYemq1gqrPYBHBDFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643856579; a=rsa-sha256; cv=none; b=aobgr4lYz6nu8gmZOQfnW1aLiJk12zposgmmhrmQBG7BHeBqEUR3wANLno2kdxPs9/VHjx X8RqNfmr9D5DCSCoiwsFfgteUoq/fumL7XUSbi0N3t/Ituq0TjyNtOJ0QVGL1f1jcBnX7X nVEf8/AwC6sSROzawcQDvg5CjfxovnSPIH+gLdn08t8PHN67bVpJaTVvx2dXlw5pwDUmop UyOHlLpQ7iEm2nC5s0rj7zV7Vw7yTq0X6c4gxsg/lV1Uw9lQ1+IW4sQaWStgYH4R7WSAMA 50NfVWitlwXU9XXjt8/rShc3IrnUSqLhQqEx6qiLWpgDUrFxcrKDb3qG2XxTfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ef061a2e2978a5e0fbfe2766ff7ab8f529bbd966 commit ef061a2e2978a5e0fbfe2766ff7ab8f529bbd966 Author: Konstantin Belousov AuthorDate: 2022-02-02 18:17:58 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-03 01:04:00 +0000 __ctype_load(): check for calloc() failure Noted and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34140 --- lib/libc/locale/setrunelocale.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c index 551d32b7ab6a..41c82e637529 100644 --- a/lib/libc/locale/setrunelocale.c +++ b/lib/libc/locale/setrunelocale.c @@ -214,6 +214,8 @@ void * __ctype_load(const char *locale, locale_t unused __unused) { struct xlocale_ctype *l = calloc(sizeof(struct xlocale_ctype), 1); + if (l == NULL) + return (NULL); l->header.header.destructor = destruct_ctype; if (__setrunelocale(l, locale)) {