From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 2794 invoked from network); 2 Mar 2022 20:20:38 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 2 Mar 2022 20:20:38 -0000 Received: (qmail 25898 invoked by uid 550); 2 Mar 2022 20:20:36 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 25862 invoked from network); 2 Mar 2022 20:20:35 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=dereferenced.org; s=mailbun; t=1646252421; bh=zolKpk4MSSUcxFHM/Jst3ozKjEvm/KDJS0QEVfrRS4A=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=aikwCYwVLZz2bluy18G1Ap6+aojjcIyeXlYuGpl+PmwMSfm+0yYzrhGRDgORqHStl wls+jd8JGLfm4Q41nyq6VoUyAEkcc8Axdk/mJvvJK5/ZyJePVIaAdTzMGKNikaHhZ+ 630JR6CI2ijeAfoKldBtGws+xyiyLEK0DV7BGBhVNmiO9CJYCxjYnWFI4VHQKHQV46 iZi2yRcFNF6/sfCRBR5AolXn1XOfCUGJqSvm/IVfRJHP2ouEZtE9n1XBoIIackNkdQ eJhbBdwWzutPwdFP8zSWd8dHzZCU3JY3Jzl2IaPPht+8Hgwc8opdVkESiV//7Bz3vf 9PgLDVVVs8F7Q== Date: Wed, 2 Mar 2022 14:20:15 -0600 (CST) From: Ariadne Conill To: musl@lists.openwall.com cc: psykose , Ariadne Conill In-Reply-To: <20220302201654.98472-1-alice@ayaya.dev> Message-ID: References: <20220302201654.98472-1-alice@ayaya.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Subject: Re: [musl] [PATCH] abort transaction lookup if NULL is passed as msgid1 Hi, On Wed, 2 Mar 2022, psykose wrote: > When investigating a crash in Transmission running under musl's gettext > implementation, we observed that GNU libintl returns NULL when NULL is > passed as the msgid1. Accordingly, make the musl gettext behavior match > GNU libintl. > > Reviewed-by: Ariadne Conill I can confirm I did in fact review this. Acked-by: Ariadne Conill > --- > src/locale/dcngettext.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c > index d1e6c6d1..0b53286d 100644 > --- a/src/locale/dcngettext.c > +++ b/src/locale/dcngettext.c > @@ -132,6 +132,9 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, > struct binding *q; > int old_errno = errno; > > + /* match gnu gettext behaviour */ > + if (!msgid1) goto notrans; > + > if ((unsigned)category >= LC_ALL) goto notrans; > > if (!domainname) domainname = __gettextdomain(); > -- > 2.35.1 > >