From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from deimos.uberspace.de (deimos.uberspace.de [185.26.156.152]) by sourceware.org (Postfix) with ESMTPS id 75188385734F for ; Tue, 17 May 2022 08:45:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 75188385734F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=jdoubleu.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=jdoubleu.de Received: (qmail 17562 invoked by uid 989); 17 May 2022 08:45:14 -0000 Authentication-Results: deimos.uberspace.de; auth=pass (plain) Content-Type: multipart/mixed; boundary="------------P6NqXiHI8VLqjHW0ClXhbI0y" Message-ID: <985b1a40-9c3a-9f7a-273d-86b59bc90265@jdoubleu.de> Date: Tue, 17 May 2022 10:45:11 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: [PATCH] update tzset tests Content-Language: de-DE From: jdoubleu To: newlib@sourceware.org References: <822e81a0-ed9f-200e-3318-0495456ad67e@SystematicSw.ab.ca> <20220407233425.2012-1-Brian.Inglis@SystematicSW.ab.ca> <9603e3aa-bd7d-6740-c710-27ace1d80397@SystematicSw.ab.ca> <25cfc7a2-2c66-f9fe-581b-8d3cec5d3bd9@jdoubleu.de> <426d1e93-6c4f-4ccc-9522-c187e10716f0@jdoubleu.de> In-Reply-To: <426d1e93-6c4f-4ccc-9522-c187e10716f0@jdoubleu.de> X-Rspamd-Bar: -- X-Rspamd-Report: BAYES_HAM(-3) MIME_GOOD(-0.1) MIME_BASE64_TEXT_BOGUS(1) MIME_BASE64_TEXT(0.1) X-Rspamd-Score: -2 Received: from unknown (HELO unkown) (::1) by deimos.uberspace.de (Haraka/2.8.28) with ESMTPSA; Tue, 17 May 2022 10:45:14 +0200 X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, BODY_8BITS, GIT_PATCH_0, KAM_DMARC_STATUS, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2022 08:45:19 -0000 This is a multi-part message in MIME format. --------------P6NqXiHI8VLqjHW0ClXhbI0y Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sorry, here's the patch. Cheers --- πŸ™ŽπŸ»β€β™‚οΈ jdoubleu On 5/14/2022 4:39 PM, jdoubleu wrote: >> To summarize, the following cases are errors: >> 1. name is too short (less than 3 chars) >> 2. name is too long (more than TZNAME_MAX) >> 3. name includes arbitrary chars (not <>+-ALPHANUM) >> In all of these error cases, the time should be set back to UTC, right? > > Here's my patch which adds test cases for the above error cases. > > It's based on the latest (pending) changes of tzset[1]. Please apply > them first. > > I wasn't able to run the tests, yet. With glibc they're obviously failing. > > Could you please test them? > > > > [1]: https://sourceware.org/pipermail/newlib/2022/019581.html > > > Cheers > --- > πŸ™ŽπŸ»β€β™‚οΈ jdoubleu > On 4/14/2022 10:59 AM, jdoubleu wrote: >> On 2022-04-13 14:33, Jeff Johnston wrote: >>> Looking at the glibc tzset code I have locally (not latest/greatest, but >>> does support angle brackets): >> >> I can confirm the behavior with glibc[1]. As it turns out, glibc does >> not directly impose a character limit on the timezone name, but >> requires at least 3 characters. From the man page[2]: >> >>> The std string specifies an abbreviation for the timezone and must be >>> three or more alphabetic characters. >> >> To my misunderstanding, they don't even ignore remaining characters, >> but keep all of them, as you can see in the output[1] and Jeff >> Johnston explained. >> >>> but you imply that glibc in fact uses the equivalent of the scanf >>> "%m[...]" (malloc) > modifier, and I think using that would be >>> against the newlib >> philosophy to keep things >>> limited and under control to support small targets. >> >> I agree, newlib SHOULD impose a limit. Especially, since the POSIX >> standard[3] already introduces an upper limit, though unspecified. >> >> The current limit is 11 characters, if I'm not mistaken. The longest >> name from the tzdb[4] is "<+1030>" i.e. 5 chars (see all extracted >> names[5]). All others usually are 3 or 4 chars long. >> >> That said, I think 11 is reasonably large enough. >> >> However, it could be helpful to get the limit from user-code, because >> there is no error reporting mechanism used. Right now, the limit is >> only defined in tzset_r.c[6]. So maybe move it to limits.h? One thing >> to not forget here is to keep limit in sync with the sscanf format's >> maximum field width[7]. >> >> >> To summarize, the following cases are errors: >> 1. name is too short (less than 3 chars) >> 2. name is too long (more than TZNAME_MAX) >> 3. name includes arbitrary chars (not <>+-ALPHANUM) >> In all of these error cases, the time should be set back to UTC, right? >> >> >> I'm going to prepare some test cases for the test suite to check for >> the errors as well. >> >> >> [1]: https://godbolt.org/z/o93zo3qxv >> [2]: https://www.man7.org/linux/man-pages/man3/tzset.3.html >> [3]: >> https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03 >> >> [4]: https://github.com/eggert/tz >> [5]: >> https://raw.githubusercontent.com/nayarsystems/posix_tz_db/master/zones.csv >> >> [6]: >> https://sourceware.org/git/?p=newlib-cygwin.git;a=blob;f=newlib/libc/time/tzset_r.c;h=9cb30b188f989f65ec9eb6417f5d74020f8c72e9;hb=HEAD#l13 >> >> [7]: >> https://sourceware.org/git/?p=newlib-cygwin.git;a=blob;f=newlib/libc/time/tzset_r.c;h=9cb30b188f989f65ec9eb6417f5d74020f8c72e9;hb=HEAD#l57 >> >> >> >> >> Cheers >> --- >> πŸ™ŽπŸ»β€β™‚οΈ jdoubleu >> On 4/14/2022 12:19 AM, Brian Inglis wrote: >>> On 2022-04-13 14:33, Jeff Johnston wrote: >>>> Looking at the glibc tzset code I have locally (not latest/greatest, >>>> but >>>> does support angle brackets): >>>> >>>> If there any parse failures, UTC is defaulted. >>> >>> We currently leave the time zone info unchanged. >>> >>>> Extraneous characters inside brackets or less than 3 characters is a >>>> parse failure. >>> βœ” CheckΒ Β Β  βœ” Check >>> >>>> Glibc parses the tz name string char by char and allocates space for >>>> the name strings so there is no max size. >>> >>> The suggestion was that glibc ignores the remaining characters, but >>> you imply that glibc in fact uses the equivalent of the scanf >>> "%m[...]" (malloc) modifier, and I think using that would be against >>> the newlib philosophy to keep things limited and under control to >>> support small targets.Β  Larger targets like Cygwin (do our own thing >>> including zoneinfo), and perhaps RTEMS, can supply their own >>> enhancements. >>> >>>> the name strings so there is no max size.Β  I am fine if you want to >>>> mandate a maximum, but if you do, then too many chars should be >>>> treated as a failure.Β  If you aren't certain of the limit, make the >>>> limit higher than you expect. >>> Current limits are 3-10 allowing for e.g. which is the >>> most ever likely to be used. It might be reasonable to bump it up to >>> say 15. >>> >>>> If people run into max limit with reasonable timezone format >>>> strings, then >>>> we can up the limit. >>> >>> The conditions are more or less what is implemented, but we could do >>> with a couple more tweaks to improve things, like check for more or >>> extraneous chars within the bracket quotes, and that no characters >>> remain unconsumed at the end of the parse. --------------P6NqXiHI8VLqjHW0ClXhbI0y Content-Type: text/plain; charset=UTF-8; name="0001-update-tzset-tests.patch" Content-Disposition: attachment; filename="0001-update-tzset-tests.patch" Content-Transfer-Encoding: base64 RnJvbSA0NDIzYzQzYmU2YTczMDE0NGI3NzZiYTRlYzQyMDRjZjcxYjUyMzQ4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBqZG91YmxldSA8aGlAamRvdWJsZXUuZGU+CkRhdGU6 IFNhdCwgMTQgTWF5IDIwMjIgMTU6NDE6MjIgKzAyMDAKU3ViamVjdDogW1BBVENIXSB1cGRh dGUgdHpzZXQgdGVzdHMKCkFkZCB0ZXN0IGNhc2VzIGZvciBwYXJzZXIgZXJyb3JzIGFmdGVy IHJld29ya2VkIHBhcnNpbmcgYmVoYXZpb3IuCi0tLQogbmV3bGliL3Rlc3RzdWl0ZS9uZXds aWIudGltZS90enNldC5jIHwgNTYgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDQ0IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL25ld2xpYi90ZXN0c3VpdGUvbmV3bGliLnRpbWUvdHpzZXQuYyBiL25ld2xpYi90 ZXN0c3VpdGUvbmV3bGliLnRpbWUvdHpzZXQuYwppbmRleCAwZTViMTk2YzYuLjg3MDJiNThk YiAxMDA2NDQKLS0tIGEvbmV3bGliL3Rlc3RzdWl0ZS9uZXdsaWIudGltZS90enNldC5jCisr KyBiL25ld2xpYi90ZXN0c3VpdGUvbmV3bGliLnRpbWUvdHpzZXQuYwpAQCAtMTExLDEzICsx MTEsNDMgQEAgc3RydWN0IHR6X3Rlc3QgdGVzdF90aW1lem9uZXNbXSA9IHsKICAgICB7IC8q IEFzaWEvQ29sb21ibyAqLyAgICAgICAgICAgICI8KzA1MzA+LTU6MzAiLCAgICAgICAgICAg ICAgICAgICAgLUlOX1NFQ09ORFMoNSwgMzAsIDApLCAgICAgTk9fVElNRX0sDQogICAgIHsg LyogRXVyb3BlL0JlcmxpbiAqLyAgICAgICAgICAgIkNFVC0xQ0VTVCxNMy41LjAsTTEwLjUu MC8zIiwgICAgICAtSU5fU0VDT05EUygxLCAwLCAwKSwgICAgIC1JTl9TRUNPTkRTKDIsIDAs IDApfSwNCiANCi0gICAgLy8gRU5EIG9mIGxpc3QNCi0gICAge05VTEwsIE5PX1RJTUUsIE5P X1RJTUV9DQorICAgIC8vLyB0ZXN0IHBhcnNpbmcgZXJyb3JzDQorICAgIC8vIDEuIG5hbWVz IGFyZSB0b28gbG9uZw0KKyAgICB7IkpVU1RFWENFRURJMToxMToxMSIsICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAwLCAgIE5PX1RJTUV9LA0KKyAgICB7IkFWRVJZ TE9OR05BTUVXSElDSEVYQ0VFRFNUWk5BTUVNQVgyOjIyOjIyIiwgICAgICAgICAgICAgICAw LCAgIE5PX1RJTUV9LA0KKyAgICB7IkZJUlNUVkVSWUxPTkdOQU1FMzozMzozM1NFQ09ORFZF UllMT05HTkFNRTQ6NDQ6NDQiLCAgICAgICAwLCAgIDB9LA0KKyAgICB7IjxKVVNURVhDRUVE ST41OjU1OjU1IiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwLCAgIE5P X1RJTUV9LA0KKyAgICB7IjxGSVJTVFZFUllMT05HTkFNRT4zOjMzOjMzPFNFQ09ORFZFUllM T05HTkFNRT40OjQ0OjQ0IiwgICAwLCAgIDB9LA0KKyAgICB7IjwrSlVTVEVYQ0VFRD41OjU1 OjU1IiwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwLCAgIE5PX1RJTUV9 LA0KKw0KKyAgICAvLyAyLiBuYW1lcyBhcmUgdG9vIHNob3J0DQorICAgIHsiSlU2OjM0OjQ3 IiwgICAgICAgICAgICAgICAwLCAgIE5PX1RJTUV9LA0KKyAgICB7IkhFNjozNDo0N0xPMzoz NDo0NyIsICAgICAgMCwgICAwfSwNCisgICAgeyI8QUI+MjozNDo0NyIsICAgICAgICAgICAg IDAsICAgTk9fVElNRX0sDQorICAgIHsiPEFCPjI6MzQ6NDc8Q0Q+MzozNDo0NyIsICAwLCAg IDB9LA0KKyAgICANCisgICAgLy8gMy4gbmFtZXMgY29udGFpbiBpbnZhbGlkIGNoYXJzDQor ICAgIHsiTj9NRTI6MTA6NTYiLCAgICAgMCwgICBOT19USU1FfSwNCisgICAgeyJOIU1FMjox MDo1NiIsICAgICAwLCAgIE5PX1RJTUV9LA0KKyAgICB7Ik4vTUUyOjEwOjU2IiwgICAgIDAs ICAgTk9fVElNRX0sDQorICAgIHsiTiRNRTI6MTA6NTYiLCAgICAgMCwgICBOT19USU1FfSwN CisgICAgeyJOQU1FPzI6MTA6NTYiLCAgICAwLCAgIE5PX1RJTUV9LA0KKyAgICB7Ij9OQU1F MjoxMDo1NiIsICAgIDAsICAgTk9fVElNRX0sDQorICAgIHsiTkFNRT9VTks0OjIxOjE1Iiwg ICAgICAgICAgICAgICAgIDAsICAgTk9fVElNRX0sDQorICAgIHsiTkFNRSFVTks0OjIyOjE1 TkVYVC9OQU1FNDoyMzoxNSIsIDAsICAgTk9fVElNRX0sDQorDQorICAgIC8vIDQuIGJvZ3Vz IHN0cmluZ3MNCisgICAgeyJOT0lORk8iLCAgICAgICAgICAwLCAgTk9fVElNRX0sDQorICAg IHsiSE9VUjoxNjoxOCIsICAgICAgMCwgIE5PX1RJTUV9LA0KKyAgICB7IjxCRUdJTiIsICAg ICAgICAgIDAsICBOT19USU1FfSwNCisgICAgeyI8TkVYVDo1NSIsICAgICAgICAwLCAgTk9f VElNRX0sDQorICAgIHsiPldST05HPDI6MTU6MDAiLCAgMCwgIE5PX1RJTUV9LA0KKyAgICB7 IlNUPEFSVDQ6MzA6MDAiLCAgIDAsICBOT19USU1FfSwNCisgICAgLy97Ik1BTlk4OjAwOjAw OjAwIiwgIDAsICBOT19USU1FfSwNCisgICAgeyJcMCIsICAgICAgICAgICAgICAwLCAgTk9f VElNRX0sDQorICAgIHsiTVwwU1RSNzozMDozNiIsICAgMCwgIE5PX1RJTUV9DQogfTsNCiAN Ci0vLyBoZWxwZXIgbWFjcm9zDQotI2RlZmluZSBGT1JfVElNRVpPTkVTKGl0ZXJfbmFtZSkg Zm9yIChzdHJ1Y3QgdHpfdGVzdCogaXRlcl9uYW1lID0gdGVzdF90aW1lem9uZXM7IGl0ZXJf bmFtZS0+dHpzdHIgIT0gTlVMTDsgKytpdGVyX25hbWUpDQotDQogLy8gRU5EIHRlc3QgdmVj dG9ycw0KIA0KIHN0YXRpYyBpbnQgZmFpbGVkID0gMDsNCkBAIC0xMzYsMjIgKzE2NiwyNCBA QCB2b2lkIHRlc3RfVGltZXpvbmVTdHJpbmdzKHZvaWQpCiB7DQogICAgIGNoYXIgYnVmZmVy WzEyOF07DQogDQotICAgIEZPUl9USU1FWk9ORVMocHRyKQ0KKyAgICBmb3IgKGludCBpID0g MDsgaSA8IChzaXplb2YodGVzdF90aW1lem9uZXMpIC8gc2l6ZW9mKHN0cnVjdCB0el90ZXN0 KSk7ICsraSkNCiAgICAgew0KLSAgICAgICAgc2V0ZW52KCJUWiIsIHB0ci0+dHpzdHIsIDEp Ow0KKyAgICAgICAgc3RydWN0IHR6X3Rlc3QgcHRyID0gdGVzdF90aW1lem9uZXNbaV07DQor DQorICAgICAgICBzZXRlbnYoIlRaIiwgcHRyLnR6c3RyLCAxKTsNCiAgICAgICAgIHR6c2V0 KCk7DQogDQotICAgICAgICBzbnByaW50ZihidWZmZXIsIDEyOCwgIndpbnRlciB0aW1lLCB0 aW1lem9uZSA9IFwiJXNcIiIsIHB0ci0+dHpzdHIpOw0KKyAgICAgICAgc25wcmludGYoYnVm ZmVyLCAxMjgsICJ3aW50ZXIgdGltZSwgdGltZXpvbmUgPSBcIiVzXCIiLCBwdHIudHpzdHIp Ow0KIA0KICAgICAgICAgc3RydWN0IHRtIHdpbnRlcl90bV9jb3B5ID0gd2ludGVyX3RtOyAv LyBjb3B5DQotICAgICAgICBURVNUX0FTU0VSVF9FUVVBTF9JTlRfTUVTU0FHRSh3aW50ZXJf dGltZSArIHB0ci0+b2Zmc2V0X3NlY29uZHMsIG1rdGltZSgmd2ludGVyX3RtX2NvcHkpLCBi dWZmZXIpOw0KKyAgICAgICAgVEVTVF9BU1NFUlRfRVFVQUxfSU5UX01FU1NBR0Uod2ludGVy X3RpbWUgKyBwdHIub2Zmc2V0X3NlY29uZHMsIG1rdGltZSgmd2ludGVyX3RtX2NvcHkpLCBi dWZmZXIpOw0KIA0KLSAgICAgICAgaWYgKHB0ci0+ZHN0X29mZnNldF9zZWNvbmRzICE9IE5P X1RJTUUpDQorICAgICAgICBpZiAocHRyLmRzdF9vZmZzZXRfc2Vjb25kcyAhPSBOT19USU1F KQ0KICAgICAgICAgew0KLSAgICAgICAgICAgIHNucHJpbnRmKGJ1ZmZlciwgMTI4LCAic3Vt bWVyIHRpbWUsIHRpbWV6b25lID0gXCIlc1wiIiwgcHRyLT50enN0cik7DQorICAgICAgICAg ICAgc25wcmludGYoYnVmZmVyLCAxMjgsICJzdW1tZXIgdGltZSwgdGltZXpvbmUgPSBcIiVz XCIiLCBwdHIudHpzdHIpOw0KIA0KICAgICAgICAgICAgIHN0cnVjdCB0bSBzdW1tZXJfdG1f Y29weSA9IHN1bW1lcl90bTsgLy8gY29weQ0KLSAgICAgICAgICAgIFRFU1RfQVNTRVJUX0VR VUFMX0lOVF9NRVNTQUdFKHN1bW1lcl90aW1lICsgcHRyLT5kc3Rfb2Zmc2V0X3NlY29uZHMs IG1rdGltZSgmc3VtbWVyX3RtX2NvcHkpLCBidWZmZXIpOw0KKyAgICAgICAgICAgIFRFU1Rf QVNTRVJUX0VRVUFMX0lOVF9NRVNTQUdFKHN1bW1lcl90aW1lICsgcHRyLmRzdF9vZmZzZXRf c2Vjb25kcywgbWt0aW1lKCZzdW1tZXJfdG1fY29weSksIGJ1ZmZlcik7DQogICAgICAgICB9 DQogICAgIH0NCiB9DQotLSAKMi4zNS4xCgo= --------------P6NqXiHI8VLqjHW0ClXhbI0y--