From nobody Wed Dec 3 02:38:52 2025 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 4dLhfP15pXz6Jfsd for ; Wed, 03 Dec 2025 02:38:53 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLhfN614vz3tJX for ; Wed, 03 Dec 2025 02:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764729532; 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=3J0KJ1nLDC2TgHqKWy+6VWD830JorenojGy9gvhw3VE=; b=x671wWvqeWy2/DJDr03/FfkwYppqlVHlUnDhG9g+ZMNnC2/nZdSMTXtU1Fz1rGoJqffmRa LMMC15R/R+CFsHXp7K61JHTmGT8SDsmeJ/CGNB4E05mF3Blv5KrEtPHXPF9Smm8Du06gnP 5swK8d4Mr0KXxVVYhHqZoImmI14qdQjmSPqndNeo8Tk3+r3ceFV8xtHwrEbBY3JOn1hm8d FedTa8vftS5h9a5KKXZEFCihjZVDoqtQiLau0mKuiiNkXSATxTM3+Uk/ASVeSCMfvRv+VD IkkXSQLLu5kl4UtARYZn9wOf3SbXWhCqJAhFx5Lv3q/yoIox2d6BnFbWimov5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764729532; 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=3J0KJ1nLDC2TgHqKWy+6VWD830JorenojGy9gvhw3VE=; b=orqbNkSbkE4nd7WpSV6elvBWYXtaD3YvlTWPVw+ncf7tWRuXGyA3MDrwV1d6IwkSwpWDq2 bPlTQjZLo3hFC07/nkc1N48kGhvBVTcMRVyzcEk/sWz1oHr2HHreCDu0o1WhY24t+/I0DW b/mBOnzlePo9wa2SsGHYxmOQSf1A9evAnb3klD0ilmuxvA7JmOn4YwiMeFD7JMBPByK6sg CDALgN7x8Qb0Of73CKJsF5HX0P6STEMeXahzM22FqD+3QDMEslseApQEvywY2YubIy/VXF O/5QvknTH78lap56kTwsE1SIRce5jkFO+BVFUFjZIcBZwwZMPtKy4wdiFVrzrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764729532; a=rsa-sha256; cv=none; b=Y8/B59Ct89FIEH5o1yrLpPx9KtFtcNWACEgqbQvTvC58zV4U7xFKLZJg/WzMXvKv5qdRQb EUeaW2dIalKWbaL7bXPGPX35F6sa/Exc6yxR5IruZrHcBIhhy9IzEsRM1k5r/49izA6t8Y EwSmz7EeVjShU19gWCwLpPM69dWqwzEQbR3Sok4T3VgmTfEVdGkcNBD2ICI3oUZDOCHCoK inkoNPnJ668SJOodKTbWSRLeya0Hw6ErHsEA2TJ9Nnj6O/2nJAQ0tR5ywznqsU9smoqpbk va2cZ96cTGV3EAcMO/i2Mt9X640/hh1c3k2ZUElzzJh+OKbWZ/ifi+2WiOt+/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLhfN5YpBz3Mr for ; Wed, 03 Dec 2025 02:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 307a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 02:38:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 6b0e99570fa2 - stable/13 - strfmon: EINVAL if the '+' flag and both signs are empty 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b0e99570fa208cc299c047591b7ded7b1b9a58d Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 02:38:52 +0000 Message-Id: <692fa2bc.307a5.3aab421@gitrepo.freebsd.org> The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=6b0e99570fa208cc299c047591b7ded7b1b9a58d commit 6b0e99570fa208cc299c047591b7ded7b1b9a58d Author: Jose Luis Duran AuthorDate: 2025-11-26 20:34:55 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-03 02:35:42 +0000 strfmon: EINVAL if the '+' flag and both signs are empty According to the Open Group Base Specifications Issue 8[1], strfmon(3) should return EINVAL when the '+' flag was included in a conversion specification and the locale's positive_sign and negative_sign values would both be returned by localeconv(3) as empty strings. Austin Group Defect 1199[2] is applied, adding the [EINVAL] error. [1]: https://pubs.opengroup.org/onlinepubs/9799919799/functions/strfmon.html [2]: https://www.austingroupbugs.net/view.php?id=1199 Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53912 (cherry picked from commit 1fd018972a18b682521bb8f004dfd162327e5db2) --- lib/libc/stdlib/strfmon.3 | 12 +++++++++++- lib/libc/stdlib/strfmon.c | 4 +++- lib/libc/tests/stdlib/strfmon_test.c | 8 ++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3 index 20cc560d401d..d537d9d05fa7 100644 --- a/lib/libc/stdlib/strfmon.3 +++ b/lib/libc/stdlib/strfmon.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 6, 2023 +.Dd November 24, 2025 .Dt STRFMON 3 .Os .Sh NAME @@ -182,6 +182,16 @@ function will fail if: Conversion stopped due to lack of space in the buffer. .It Bq Er EINVAL The format string is invalid. +.It Bq Er EINVAL +The +.Cm + +flag was included in a conversion specification and the locale's +.Va positive_sign +and +.Va negative_sign +values would both be returned by +.Xr localeconv 3 +as empty strings. .It Bq Er ENOMEM Not enough memory for temporary buffers. .El diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c index caccbdb476b0..2dfc7d99510e 100644 --- a/lib/libc/stdlib/strfmon.c +++ b/lib/libc/stdlib/strfmon.c @@ -172,7 +172,9 @@ literal: flags &= ~(NEED_GROUPING); continue; case '+': /* use locale defined signs */ - if (flags & SIGN_POSN_USED) + if ((flags & SIGN_POSN_USED) || + ((lc->positive_sign[0] == '\0') && + (lc->negative_sign[0] == '\0'))) goto format_error; flags |= (SIGN_POSN_USED | LOCALE_POSN); continue; diff --git a/lib/libc/tests/stdlib/strfmon_test.c b/lib/libc/tests/stdlib/strfmon_test.c index 0126c2f3f8a8..7fc0afc9e229 100644 --- a/lib/libc/tests/stdlib/strfmon_test.c +++ b/lib/libc/tests/stdlib/strfmon_test.c @@ -235,11 +235,11 @@ ATF_TC_BODY(strfmon_plus_or_parenthesis, tc) if (setlocale(LC_MONETARY, "C") == NULL) atf_tc_skip("unable to setlocale(): %s", tests[i].locale); - /* ATF_CHECK_ERRNO(EINVAL, strfmon(actual, sizeof(actual) - 1, - "[%+n] [%+n]", 123.45, -123.45)); XXX */ + ATF_CHECK_ERRNO(EINVAL, strfmon(actual, sizeof(actual) - 1, + "[%+n] [%+n]", 123.45, -123.45)); - /* ATF_CHECK_ERRNO(EINVAL, strfmon(actual, sizeof(actual) - 1, - "[%+i] [%+i]", 123.45, -123.45)); XXX */ + ATF_CHECK_ERRNO(EINVAL, strfmon(actual, sizeof(actual) - 1, + "[%+i] [%+i]", 123.45, -123.45)); } ATF_TC(strfmon_l);