From nobody Wed Feb 9 00:48:19 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 298B419B77CF; Wed, 9 Feb 2022 00:48:23 +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 4Jth7n5Ft3z4tgn; Wed, 9 Feb 2022 00:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367702; 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=k5OgFZ7ddH+lN8mYHq1ckq/rjQpC0WYOtsozEIwGyec=; b=DEalE949OihNhsQ5SRfLyTdBzzN+MKGJJ803TK46qoIcCI4JoChf8QKfuF1Alown9iuwgH jtCB7AqyZr8D4d998YT1TD85LsNVC/WV/Nbx05ep3ZEyEmed5NqWuBR1WYFrnYUc9uhSu0 qIaOAJS+wo20wT2q6qFmsdv4kbFKM96ImGlLO0+eacfFISKSVsR1n4lJRVJ2OddFWBLCiM /bUkTPj/1XLtnCqYdnudQdxTl4yk8x+ZXgJHI/Cvk6ADTSRs05UnAvSfBg2/vIWyk5dprA EWou+oL9Lkf1y3mX8u3zNizdpLTkAovivYxSrwMtBqwgeoMHc7xxI5JJyuhzlw== 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 1E5ED237DB; Wed, 9 Feb 2022 00:48:19 +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 2190mJsP083976; Wed, 9 Feb 2022 00:48:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2190mJOg083975; Wed, 9 Feb 2022 00:48:19 GMT (envelope-from git) Date: Wed, 9 Feb 2022 00:48:19 GMT Message-Id: <202202090048.2190mJOg083975@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: a6ba681b44d7 - stable/13 - __ctype_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: a6ba681b44d7048c69d54f9cc8ed57c8b46c912b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367701; 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=k5OgFZ7ddH+lN8mYHq1ckq/rjQpC0WYOtsozEIwGyec=; b=ycEpHULvc8U5KmK6ucan0QdOinQB6p+a8gNVdCjQOtxnFx4w1P+8qbDyGGhbugsnbTkZ5X p40SBXT3WybAe7L92x+eAsTsALaB1dTw4tUqTx/j8scqTJuz7wBlx3JHj00HSyiY44I2cm llUp5sPFkfutJbCPb+zkoCfrhWs9SOZl7H66NlPFFGdlEqm98E7yHIymUnT4bP6OY3VId4 pHfGdhbelqJ2xw8IrbjocNA5eVgvz/1QYrifehyAUP2jr4rYCReH/k8K8Rho7yqvIIJ8A/ dSZYlsH8w/BUrEKqeCEJ80ADGqyyxsCmcAVy3snxxKj3rtum78fIv/cZka88Ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644367701; a=rsa-sha256; cv=none; b=gw7pbTOyf/zWNM5B1NfY7dYZWzis2sYE6sKU1KiceVeTbyJ0wcoNpRF9FrUWH8XBI3E/++ zBRXopxr21Ofgu/hlFJqW7ymJ/zGkvx4zUM/bXtW/fCFAcNKLwPUH84IMvjXyBe3Zyi8il bXQ6N/14i2fDPUgLaK5xvT9Vq5eMv9lISt40DgbDN476+GiOFa6vG2/uTicGsmUQlJ3i+O TvEFqg1IQF/Gy4GVF5ocEs9YKvSomefVA059fUKWO8/Z7YVlsCPXRBvJmuid3Kpz4uexfo P6L2vYulHGHQd/jGvqSi4Ki1U0buyl0qUO2Qhu3tfT90pAtpf5xhwUYeZYte8w== 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=a6ba681b44d7048c69d54f9cc8ed57c8b46c912b commit a6ba681b44d7048c69d54f9cc8ed57c8b46c912b Author: Konstantin Belousov AuthorDate: 2022-02-02 18:17:58 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-09 00:42:46 +0000 __ctype_load(): check for calloc() failure (cherry picked from commit ef061a2e2978a5e0fbfe2766ff7ab8f529bbd966) --- 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)) {