From nobody Wed Feb 09 00:48:15 2022 X-Original-To: dev-commits-src-all@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 BC91119B7807; 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 4Jth7k3YfHz4tmK; 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=1644367700; 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=Ah2+a5ysCfukVhUSDCO1TiLlNLiqQO5xhD/AXz3e0tA=; b=tGaWn/nhAxKKGmzdIopL0YZH3XVEl0KO9mOjLixSG0+NnqI2cnGNgVCpw/dzRgNJj/mtfS b0q/tflZMfC7uy5KceqgwRvbU6r5TmBpmxxbtD9LsZVyw2eFkOGdDz51NA/tCX4teX0kPf LPKgHMvsKDbgE5yrLBKNAxOmql7bov4UlkkGuEKu0WOD46UWRSc/Kv1FqjMg3PGflpaXsp V3/nZ0kD3DKvJTWtOvRy0NS0TF47bgMRD4kSeXQieGBJcPlk9S2eABnV3XBjcP7KefuL/B 95sLJQpgOVP6iGD3SZB9GpQlnNHQ0+rKGNHkYWRZjmo4dIP/zk2Lk33mQel6tw== 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 ACD2A23650; Wed, 9 Feb 2022 00:48:15 +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 2190mFSN083904; Wed, 9 Feb 2022 00:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2190mFiW083903; Wed, 9 Feb 2022 00:48:15 GMT (envelope-from git) Date: Wed, 9 Feb 2022 00:48:15 GMT Message-Id: <202202090048.2190mFiW083903@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: 23da067dd4c7 - stable/13 - __monetary_load(): check for calloc() failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 23da067dd4c77ba52c64c0661f7e903061290b67 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=Ah2+a5ysCfukVhUSDCO1TiLlNLiqQO5xhD/AXz3e0tA=; b=PmPQvrEXJeNowvTqU2M/kMIXSuxgr4pQjBvg0Qdzwe8DxcbYUDkBAxVMNDwGd1ll/GtLxE mqGcJMdawKhawn5FNlWuAh5FwtTKRsM9yMalI4d8YNn1q65tHOPmBRkSd1K60NI4EUvho7 XxJufffTDPT4HWonGHuo//nr+H4iw+BEk4zM7FvD+axIoc40tihV/Wb6R2gMjO0vuIpO5M vLeyUbAc4+h2mohHkn/37tgB30BoOC9QSjQtrdfza9BxHpI6cH5XNNUn/IAFuOgO16E1hf tF90o3Opri6vOTV+XY+rt1TsS6OaxOzDM0mYxCOHFRfdI31Z6078RQDw4tWlNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644367699; a=rsa-sha256; cv=none; b=UTBMtIrRg84iwCEu8DHGLjbxlfwJz4bWYXe7uWIbBHG3ti68xjSwoTmVYXXeF1n0f8h0cA DAFZZugZCh3nyKQG0EJKNJNNS3Ab77WW0ZOk5kjq1UTm0P5bFcIC++GtGrf2tJ/6inUW/d +GLnKXGO2RxrVOwOYCQ4eX+iKRUrJqfCQT+NThd8jrBBLYX2z/+VFl5qfUFjCtpYeq2SAr JR6OpgJKDr/nPgMMxBiwOXbbeiI/dYJozBfpbG8u80Px37f2hhD7FK/bdTJ+RmcvZjd6Zd DBmmaa7vz2rFuIMGGB6fivxXSRTbNvJkIv0yqfkYeWiXbZc4cVbSf9Tv6RLwHQ== 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=23da067dd4c77ba52c64c0661f7e903061290b67 commit 23da067dd4c77ba52c64c0661f7e903061290b67 Author: Konstantin Belousov AuthorDate: 2022-02-02 18:12:43 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-09 00:42:45 +0000 __monetary_load(): check for calloc() failure (cherry picked from commit 4d3b84f67c2e1c75414ba52578364e729f425103) --- lib/libc/locale/lmonetary.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/locale/lmonetary.c b/lib/libc/locale/lmonetary.c index c8811e8d59a4..cdf4af79c3ab 100644 --- a/lib/libc/locale/lmonetary.c +++ b/lib/libc/locale/lmonetary.c @@ -162,6 +162,8 @@ __monetary_load(const char *name, locale_t l) { struct xlocale_monetary *new = calloc(sizeof(struct xlocale_monetary), 1); + if (new == NULL) + return (NULL); new->header.header.destructor = destruct_monetary; if (monetary_load_locale_l(new, &l->using_monetary_locale, &l->monetary_locale_changed, name) == _LDP_ERROR) {