From patchwork Tue Jul 1 09:17:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christian Franke X-Patchwork-Id: 115401 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5876B385DC1B for ; Tue, 1 Jul 2025 09:34:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5876B385DC1B X-Original-To: newlib@sourceware.org Delivered-To: newlib@sourceware.org Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by sourceware.org (Postfix) with ESMTPS id 0790A3854A88 for ; Tue, 1 Jul 2025 09:17:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0790A3854A88 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=t-online.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=t-online.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0790A3854A88 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=194.25.134.84 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1751361442; cv=none; b=yFXTmJBOqSmv9Zaty5YdYLkIKsfwrReHcmslL009/jjt1yiGqtkWItFjDqwaOr/7YMjU6ri1CANfFbKSYOUX1rLbRCfNNmjgUGD/ZlFqkfn296HcIrSIAw3+JmIvchAjE6PQ2J6ABZztxIE4DoIM1Uj3Bjz3CXbtBdGOleb6ADE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1751361442; c=relaxed/simple; bh=zmlI6SCuISw1aq1UI1d2gtwPmjpVm1NCmvqh3UT1UcY=; h=From:Subject:To:Message-ID:Date:MIME-Version; b=oMX5A1AFQ3mstudEfM6Q/xDSbgt2OAMlx4e4fQMTOVtH0a0qDIgWH9017knZZ75MUhso0n/Eg7kjWQIvk+CvoGyiBNNG/gNyQrCl9BzkVhnBEm9MbdSywP+pNdH9AHrzfYnDxhQO8gsagJFJrfyxIVvdpnEXTkQdNYglHT2+Llk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0790A3854A88 Received: from fwd80.aul.t-online.de (fwd80.aul.t-online.de [10.223.144.106]) by mailout09.t-online.de (Postfix) with SMTP id 90FD338723 for ; Tue, 1 Jul 2025 11:17:10 +0200 (CEST) Received: from [192.168.2.101] ([79.230.172.57]) by fwd80.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1uWX6z-0XSSxM0; Tue, 1 Jul 2025 11:17:09 +0200 From: Christian Franke Subject: [PATCH] wcstombs: also call __WCTOMB on terminating NUL if output buffer is NULL To: newlib@sourceware.org Message-ID: <59a1e693-b46a-92f5-a209-0d21f9d73d69@t-online.de> Date: Tue, 1 Jul 2025 11:17:07 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 SeaMonkey/2.53.20 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1751361429-EFFFD505-9C136221/0/0 CLEAN NORMAL X-TOI-MSGID: 45e63d40-c77f-488c-a123-9e0146cde1f3 X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_BL, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: newlib@sourceware.org Errors-To: newlib-bounces~patchwork=sourceware.org@sourceware.org Testcase (requires sizeof(wchar_t)==2): $ uname -sr CYGWIN_NT-10.0-22631 3.7.0-0.165.g1b60f4861b70.x86_64 $ cat mbslen.c #include #include #include int main() {   setlocale(LC_ALL, "en_US.UTF-8");   const wchar_t w[] = L"t-\xD801";   size_t n1 = wcstombs(NULL, w, 0);   char s[42]; // "t-\xED\xA0\x81"   size_t n2 = wcstombs(s, w, sizeof(s));   printf("n1=%zd\nn2=%zd\n", n1, n2);   return 0; } $ gcc -W -Wall -o mbslen mbslen.c $ ./mbslen n1=2 n2=5 diff --git a/newlib/libc/stdlib/wcstombs_r.c b/newlib/libc/stdlib/wcstombs_r.c index c6a06a39a..2c82a2c25 100644 --- a/newlib/libc/stdlib/wcstombs_r.c +++ b/newlib/libc/stdlib/wcstombs_r.c @@ -17,14 +17,15 @@ _wcstombs_r (struct _reent *r, if (s == NULL) { size_t num_bytes = 0; - while (*pwcs != 0) + do { - bytes = __WCTOMB (r, buff, *pwcs++, state); + bytes = __WCTOMB (r, buff, *pwcs, state); if (bytes == -1) return -1; num_bytes += bytes; } - return num_bytes; + while (*pwcs++ != 0x00); + return num_bytes - 1; } else {