From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id A93173858C2C for ; Thu, 1 Feb 2024 19:11:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A93173858C2C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A93173858C2C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706814702; cv=none; b=jifc7U+gjC1iAtCKJuQVJJRIG6LyuJX1gwcNh40nsDfSiSdOpHro7l9o0orMxB2S4NFuBEhm1W6yLeVU2rNk3gonS5IbMW3L4an3uCZyvLKEFcXc3R2IbHwJGg7h2MJ+87imMfKWxErDFQpUkXYyF6Af5trHppkAgIFQfF7iHek= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706814702; c=relaxed/simple; bh=0esSW9a8w/duB3kRTyLDeNQyqVpTdlW5cyBfiIy2xZ4=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=W9phjz6dvfJBLv6n9bHPyS3ovboi5tZHady8iztOSfMvuWIy36bPWh5xTspUFrjP3Wo1pRpkfyA46M1P0QfOC3z2v6WmOQaxKkOb3l0ZRZ+jcFczSVRCu3doC11XgqMhrNJBb0mGAUFtc4aJDiFJ9QgA6SwzB0LGJyLIqlzv+X4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706814700; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=PF86HJji0v7Kf6zOHyL8CHJmrGQcrpOeaSGslJ62tsI=; b=Cs911+eFuCpdDReq8UKK9hg8yvgpjcNdjTBjMiXc7Tu+Lj0DzjO08R6kcJTHUlqky41fOT Aon/DHWJUJRJcqLYasvTBVHpNjq/wnfsUBEbK61+F9NFr3hUgTDXoH4zfvj0CESjAqY7/3 UtFebAT19wkiRNhT1nmQGgc2B3ljVmA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-194-TAXrIjNkOsa1Ybsi2qSceg-1; Thu, 01 Feb 2024 14:11:37 -0500 X-MC-Unique: TAXrIjNkOsa1Ybsi2qSceg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A45DB86D4D3; Thu, 1 Feb 2024 19:11:36 +0000 (UTC) Received: from calimero.vinschen.de (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3D89A2026D66; Thu, 1 Feb 2024 19:11:36 +0000 (UTC) Received: by calimero.vinschen.de (Postfix, from userid 500) id E3E3DA80A33; Thu, 1 Feb 2024 20:11:30 +0100 (CET) Date: Thu, 1 Feb 2024 20:11:30 +0100 From: Corinna Vinschen To: Jeff Law Cc: newlib@sourceware.org Subject: Re: Problem with recent change to getlocalename_l Message-ID: Reply-To: newlib@sourceware.org Mail-Followup-To: Jeff Law , newlib@sourceware.org References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: No, wait. On Feb 1 20:00, Corinna Vinschen wrote: > Given that this new functionality needs a 32 byte buffer, and given that > _REENT_SMALL targets are... well... small, I made the new buffer > optional via `#ifdef _MB_CAPABLE' in struct _misc_reent, which only used > by _REENT_SMALL targets. > > Apparently I missed to take the _REENT_CHECK_MISC expression into account. > AFAICS the culprit is the _REENT_INIT_MISC macro now. > > Can you please check if this change fixes the problem? Try this one instead, please: diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h index 4e60c3096ae2..1fd503b9a699 100644 --- a/newlib/libc/include/sys/reent.h +++ b/newlib/libc/include/sys/reent.h @@ -514,8 +514,8 @@ struct _reent #define _REENT_CHECK_EMERGENCY(var) \ _REENT_CHECK(var, _emergency, char *, _REENT_EMERGENCY_SIZE, /* nothing */) -#define _REENT_INIT_MISC(var) do { \ - struct _reent *_r = (var); \ +/* Do not call directly, use _REENT_INIT_MISC(var) instead */ +#define __REENT_INIT_MISC_BODY(_r) \ _r->_misc->_strtok_last = _NULL; \ _r->_misc->_mblen_state.__count = 0; \ _r->_misc->_mblen_state.__value.__wch = 0; \ @@ -533,10 +533,20 @@ struct _reent _r->_misc->_wcrtomb_state.__value.__wch = 0; \ _r->_misc->_wcsrtombs_state.__count = 0; \ _r->_misc->_wcsrtombs_state.__value.__wch = 0; \ - _r->_misc->_getlocale_l_buf[0] = '\0'; \ _r->_misc->_l64a_buf[0] = '\0'; \ - _r->_misc->_getdate_err = 0; \ + _r->_misc->_getdate_err = 0; +#ifdef _MB_CAPABLE +#define _REENT_INIT_MISC(var) do { \ + struct _reent *_r = (var); \ + __REENT_INIT_MISC_BODY(_r) \ + _r->_misc->_getlocale_l_buf[0] = '\0'; \ +} while (0) +#else +#define _REENT_INIT_MISC(var) do { \ + struct _reent *_r = (var); \ + __REENT_INIT_MISC_BODY(_r) \ } while (0) +#endif #define _REENT_CHECK_MISC(var) \ _REENT_CHECK(var, _misc, struct _misc_reent *, sizeof *((var)->_misc), _REENT_INIT_MISC(var))