From nobody Thu Feb 03 02:49:31 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 CFCD019A0F11; Thu, 3 Feb 2022 02:49:33 +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 4Jq36M4YsRz4bDv; Thu, 3 Feb 2022 02:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643856572; 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=IB6r/4W+vjo+AJc9ymiizbGGMr58Ah3ZzLcRruvYcYk=; b=ZHaQp2CV7OHJ6hl3HGfVK/19dhRnVBts8p7zlAXNz3osHxwvK7QEFnAeMmGwgQkUNDMfiZ oDKneSpfmoVgKOGI7ZI4RfV0Tl/lPG2QcD0ydjBKnodxcjruiwdTAseO+O3qdXuu5Fw5Gp JI2axd3bdtLBqifnwvDKahx6Wik1GCGoQPReloU6ndC0lXhxO1gapWF1GVKbkkAK7y8eQW owULAzb+eXS9lkMAl8zXcSE7Q9uFoNGNLA4TavxmpH/SPRTnVpMHL3KZDfgV5YH8nlBq84 cs34vHZwoXufMhGPM7YXBHQK5yX6F1RnWsV8//1C0CKif9DVWi/w0OpDoWxp3Q== 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 42E9210082; Thu, 3 Feb 2022 02:49:31 +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 2132nVFP087059; Thu, 3 Feb 2022 02:49:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2132nVR5087058; Thu, 3 Feb 2022 02:49:31 GMT (envelope-from git) Date: Thu, 3 Feb 2022 02:49:31 GMT Message-Id: <202202030249.2132nVR5087058@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: b8ad908ad98a - main - __collate_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: b8ad908ad98a6f2d8ffff979c2abb7895c55a82b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643856572; 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=IB6r/4W+vjo+AJc9ymiizbGGMr58Ah3ZzLcRruvYcYk=; b=qXeTNZyBe/aWAWHnwb2JqlMiy5mTJckPnFyaR6tJfGR8qZ400D+TUbMgcmjHB45/eDZeq3 z/34iHapIUqJBHpdrz6+Qjz7jCo/JlN64pS06B7rxUkBOgWcKKIxnLNygUNKGLs2h7jwCM ESg49LBZAvplO9tbPhV00PmFw483hSfK7HEsS9MZ2oVellj2qHgt2TEvTbjdqdqy5X3u/l Jw/x2ZKpbfWgBkgcB5paCreTtrzDzEUhr5fduKinKhyPWiKrQ1KCfh8xtNLazZn1eooUkB nsBmaHwGC09hbNdkcYS2SB00Tj55W1Mk7FgomcVtsTc5+vPqdt5ZLc8ZFKNxsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643856572; a=rsa-sha256; cv=none; b=M1ZnlGe2xCPNLxMncUr1uoKEsT4n0Qs5H0VC7sAN6yGqnG4Dz1R88Ao620JcihmuWrGWQj KrGjJ8Wf5fU2l9qIrKyLaEJGJhoUl++5Vs6gysiOcCai2mlQiEJeQyNucyymdZo1QS7q0q PkNFOZVS+RLxDrXOUtPSuPi2ngg3TroibXYKzWWODV20i+bedI2f5JKWdCDweba0iTOQ2w DeXg8YaW8y/o/UldDXFarJCruPPyYnt5dT1Mwo+xQ4iiFeQ+5zIYFw89JTK0LKMcy3fjoi yHKt6n/qttvnRffut+vV8g5P0WS40EcJDAqp9VqcavL3onhbOErNImCpDJYFmw== 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=b8ad908ad98a6f2d8ffff979c2abb7895c55a82b commit b8ad908ad98a6f2d8ffff979c2abb7895c55a82b Author: Konstantin Belousov AuthorDate: 2022-02-02 18:01:56 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-03 01:03:07 +0000 __collate_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/collate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c index 4365334322cd..2f0e2003aa45 100644 --- a/lib/libc/locale/collate.c +++ b/lib/libc/locale/collate.c @@ -90,6 +90,8 @@ __collate_load(const char *encoding, __unused locale_t unused) } struct xlocale_collate *table = calloc(sizeof(struct xlocale_collate), 1); + if (table == NULL) + return (NULL); table->header.header.destructor = destruct_collate; /*