From nobody Wed Feb 09 00:48:11 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 BB85C19B716E; Wed, 9 Feb 2022 00:48:14 +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 4Jth7d3lgBz4tbp; Wed, 9 Feb 2022 00:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367693; 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=TeXPOHDkOw4vl7eOjnLmwbawZFxUSP/P+zMzNEEvKSM=; b=wgvRm5BO4JHVYLrqUCrsy5XQhcCtF1xwJGV8aGCP+H4jrpXCco58uF3UWzbrfZu/rpF/Mg gZ8dDucERNS/4ln16bWEzrFfpkoSFwQnKBX+hA6MEX34ksIpTT2hKUBQLFPkH/JaYdTJKH 5DFaYtNxN1biTSUpfHJsjEw+jTNHup9muG5LPJaiwfutq+vNytYIWIPTlq7i3jY9k10ILH Mg3+Dxyh/AWXBlo1KfPcZbEkMcPJafeQX6/gagHzmrxjZBSf55f5p+gLLGI5yphQ91aduL PJECT2j9Jcymr9PiqcTlQv6ohmPz1NRhQOnJF1CfwEA0yw+hWHA6yg2LkUvLAg== 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 36A5D23A83; Wed, 9 Feb 2022 00:48:11 +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 2190mBiV083780; Wed, 9 Feb 2022 00:48:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2190mB3t083779; Wed, 9 Feb 2022 00:48:11 GMT (envelope-from git) Date: Wed, 9 Feb 2022 00:48:11 GMT Message-Id: <202202090048.2190mB3t083779@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: a0f1e4c5caef - stable/13 - __collate_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: a0f1e4c5caef4974a798aae2a4c244a7eb96f568 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367693; 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=TeXPOHDkOw4vl7eOjnLmwbawZFxUSP/P+zMzNEEvKSM=; b=AOGCyMR+eLU8EVqYY1/Yq2JwtUXsxIoIyvPZhYxJobzDmav8haiQHlZUgu4w6yxQz7K0S4 IAtABdnleFg8mu8Gg1pN89N/AiDxV/iUclkAnREM6ZE0MsEMDjF0WY3YmqXL61RXH/sH7Y mpDFUhppCoORORw026krfnmR7leM7EEbe3CfKFlVwgPmscL4xGF3Eg+vEFtLvyz5M42h9m lY+8rjcFFzzvU7J4hE8pfnCac2OGfVvns+skpbhjL0AIRriBsnodD8wYt6rcXEaMXf6PLw 6f1Qvj7STGu43+lCnllmcnhMGDt9v4hOcCTcJ2HqnvOHfkxP2G5+R9yfpwvdSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644367693; a=rsa-sha256; cv=none; b=NH8q/5pbMKrVQa+8ANzZRiL9oVSdfDETt7xXf0umMMZUUv/ONrK8zyvb9nAMEFhhnseAfu wFfWA6LEewpJnxyk00Tmx4ZaUrLME3lG0LA21uuDG6UMpsgZ9iPq5XndXKJelj8UW+R1Ry Oap7c4ia9I5Fn+SYKDd+fCJ6qBJkSuxQ36GHVEhTGXWWe0aIiMq7C68bNAJ1SGCFutZxGr FakUDmz4kvBhw/LwykBtfRr5NoP3j0rbEUuMxoHoBvbDEvJxWqKMAnvpWmDbOK4UPTa8Wx LJ7wtasPbbWBQjMvCJVtuBFb0Yu1Bk2UT3D/yMWrP6o3Qe0jckd1em/w9kcKNQ== 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=a0f1e4c5caef4974a798aae2a4c244a7eb96f568 commit a0f1e4c5caef4974a798aae2a4c244a7eb96f568 Author: Konstantin Belousov AuthorDate: 2022-02-02 18:01:56 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-09 00:42:45 +0000 __collate_load(): check for calloc failure (cherry picked from commit b8ad908ad98a6f2d8ffff979c2abb7895c55a82b) --- 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; /*