From nobody Wed Feb 09 00:48:17 2022 X-Original-To: dev-commits-src-branches@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 80E3D19B7801; Wed, 9 Feb 2022 00:48:20 +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 4Jth7k3ZYcz4try; Wed, 9 Feb 2022 00:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367699; 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=JePLRrAdfEikHAJTBatpO0H8tk7d3vCwfDSFqgKxA54=; b=UazVGw9u25sXOy7YggT1bun5z5A/gNoKajTQX+hbeRLyP+jbq913awnP2jlVwd8MjAb3Rs UZSlhxqqcFGF7eTTXYXqndqJsoNb6bRgtFnvVIgGtGZJB7cdbub+by2XNz+AeFskDynhNG LDcujw/EtWMFU3u/EEC+m0QI1QXUC46tVyTdMl0RlfCd3MLt74m2QUII9o5nwuPv3aEVMq YY4zSN6uVY8uX/Cw8xHzSpsWsuXrUWrKjo67ZRxZJu7ogre4N/jM2vAg+TyqYCuA7XNyTE hhjyMPZObVPX/XSux1U7NiZuevIyXm23ErNUIRLTJquUOy/IRrwmNmixY0EDxQ== 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 F27A2237DA; Wed, 9 Feb 2022 00:48:17 +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 2190mHun083952; Wed, 9 Feb 2022 00:48:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2190mHTw083951; Wed, 9 Feb 2022 00:48:17 GMT (envelope-from git) Date: Wed, 9 Feb 2022 00:48:17 GMT Message-Id: <202202090048.2190mHTw083951@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0f674081c45c - stable/13 - __numeric_load(): check for calloc() failure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0f674081c45c9cce1731c1fed92250965c004af2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367699; 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=JePLRrAdfEikHAJTBatpO0H8tk7d3vCwfDSFqgKxA54=; b=t9SPisQGhWrtgEMbzhnbjukYbdWGbhj+ylbBe+TUOgqZNnqnwSh4M1p0uWLpwUfIM79QUV L1gYzf6oEqqOHV3bVd9EZ1jKAkkGwhhJtEnlmFGCFF2LmkEPMZTN6f7T46rHQvc0n2tc40 EdUq8uQIg+9k17y0Ln0oDEEdgy6DGDvW2oDl6c4gaTDNuu0NyieodnTM6oP77Q7l9kVzVH s4+3MXs5slmj2Ec/mYfMpuup4SF3h2cqnYgZikohMxHM59SSay5226QuVHgYxrvHlQR0qu +I5Ckk4e+n1B77QV948FmF3TE739y7lDfCP0EWe3jhyK2xLtf+Li3xSBIPGtVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644367699; a=rsa-sha256; cv=none; b=I0j9ebHkY8Ky0CtxLzbv+6itctdl6xwB5DooKYXCeWlPzl/pYgj4mK4A4rzDt9IAvhanvZ N74AA+ps8PHPlgl9NUZmZLHMnqatzxdt3d0LLcU3pIMGur7Kx1HT/kCVWZYbs1jemdWvmN U9mr8WguaQFoENqdUStO4I0MV1/V/srs98oKwylgIRKVM+KKFbVMCt6f9CmIDsI6NXje5+ Nadx4X9Rv716zhC6AX8T1OVtCHyWJwDNkIfRNwFhgFdoL3eCj8p2/GvNsJXWnQpt8kH14/ nWD6fMUx0OhLYPSaCRZWoebyENhpDH7fWOyspQaj1MAhqEorMklu3mzpU+9/Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0f674081c45c9cce1731c1fed92250965c004af2 commit 0f674081c45c9cce1731c1fed92250965c004af2 Author: Konstantin Belousov AuthorDate: 2022-02-02 18:16:25 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-09 00:42:46 +0000 __numeric_load(): check for calloc() failure (cherry picked from commit 87151b60e069fd16530fd36aace85d651b936c01) --- 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 d7305505fa65..c75568989c89 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) {