From nobody Thu Feb 03 02:49:37 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 01C2619A116F; Thu, 3 Feb 2022 02:49:39 +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 4Jq36V5QrBz4b60; Thu, 3 Feb 2022 02:49:38 +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=l+h1NX4wLuXxjFuSNvWtUjjXrgqZ+B1ejKQZLClKwds=; b=gDEiRXOawJkhgz9JqCS1d9jSZOMMhoS7O+Bi3Cwz5URcjrclhGP0noMvft+XqwYcxFHqtJ T5oA9RM0FMYcXfJZJtXk7Ow73XicFUUY/R2uMU5ovp0VgmLPgWxCO+/Su5dyKx0cJcnz7M 1Nwy2LXI+eCy0DoTVoX3IezfYdxpp79tjixguK5NDpI/mr9deYmyC3UyN5O1husKHn5Zbs gbDN1a9S2SaP5OkxVNWZ8pSnvSIi+NnTn/5l+CkSRwTNUV/LPEVwTd1gJ/YtPZkbf9zrLz UjxSTw1TKPUWXgA3oiJOo+CB/6H7gbt0Z2+SFLmuPEQJaGLURuNssHRpVw9W0g== 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 0EAD87CC7; Thu, 3 Feb 2022 02:49:38 +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 2132nbqx087221; Thu, 3 Feb 2022 02:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2132nb7V087220; Thu, 3 Feb 2022 02:49:37 GMT (envelope-from git) Date: Thu, 3 Feb 2022 02:49:37 GMT Message-Id: <202202030249.2132nb7V087220@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: 87151b60e069 - main - __numeric_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: 87151b60e069fd16530fd36aace85d651b936c01 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=l+h1NX4wLuXxjFuSNvWtUjjXrgqZ+B1ejKQZLClKwds=; b=xR85c5Kdv6iXxgD4BWsLW1613wn2rw6e/DzNFUMD03KUE0LPGileauW7u8+3WzhwFq7HqT B1B0vGgnm5c5fGbf+X8OuUmqv45pbELp62wcjqBQpWu03YyyrLpYHV0AijdL0v/V66VKsG tq3P5TX9NbnWP3LcswWIIrQbdgjtsGBO/592SmFQEb3boWWiPVMQptVmD9AK0NcS/63sGj VCnj7oGZcO5gM7oaNOqVkXFCUiiQtvxEuiIkyDXpnyAcA+CDg68hlnvId+GZNOEX16STgl J3XJuu9VM8+uPM090ycmkEEVAxHNZETcf1VGEO88o/py3mcoztVpIApMyPcxSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643856579; a=rsa-sha256; cv=none; b=RBozJzchimyPMaKwSL1EJsR2pNaNK7vGHHjX6mNCrGawg8ja5ouKgSGmtTAOuv8r2mYr3G mV0jW57XTZVE+vrdw07Z//NnVYpSUF482uORXkIsPG0riapLD7kvZMM8K71RJ3sXV7K2r6 KFGvVSGzYZnGoKU8PL/ra7vbJjMOO4lxl2FLVfE+7Am9Wl47xPNgfF9yXPiE5EBoS+e07M VAqRAq2msLfk8ZFwcuz/nj6mDwv2Owcb0fKhAzvWB57DXjsrqjEtTy6M+XATT/o9j6cj0f FRTUFmrnqggw8V6cbqQK9lnEhDNmWjPOowUpAwq+HMz6yWiiuKInKlA6tXm2aA== 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=87151b60e069fd16530fd36aace85d651b936c01 commit 87151b60e069fd16530fd36aace85d651b936c01 Author: Konstantin Belousov AuthorDate: 2022-02-02 18:16:25 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-03 01:03:52 +0000 __numeric_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/lnumeric.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/locale/lnumeric.c b/lib/libc/locale/lnumeric.c index 1b2a91d3652c..32c4b9880c1e 100644 --- a/lib/libc/locale/lnumeric.c +++ b/lib/libc/locale/lnumeric.c @@ -99,6 +99,8 @@ __numeric_load(const char *name, locale_t l) { struct xlocale_numeric *new = calloc(sizeof(struct xlocale_numeric), 1); + if (new == NULL) + return (NULL); new->header.header.destructor = destruct_numeric; if (numeric_load_locale(new, &l->using_numeric_locale, &l->numeric_locale_changed, name) == _LDP_ERROR) {