From: Stanley Lancaster <lancasterharp@gmail.com>
To: libc-alpha@sourceware.org
Cc: Stanley Lancaster <lancasterharp@gmail.com>
Subject: [PATCH] Update to %Z fix
Date: Mon, 24 Jul 2023 08:53:22 -0500 [thread overview]
Message-ID: <20230724135321.12195-1-lancasterharp@gmail.com> (raw)
In-Reply-To: <3ce1cc0e-ca9c-524a-2efb-3446d50a4b86@cs.ucla.edu>
---
time/strptime_l.c | 16 +++++++++++-----
time/tst-strptime.c | 2 ++
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/time/strptime_l.c b/time/strptime_l.c
index 85c3249fcc..2382defc92 100644
--- a/time/strptime_l.c
+++ b/time/strptime_l.c
@@ -770,11 +770,17 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
break;
case 'Z':
/* Read timezone but perform no conversion. */
- while (ISSPACE (*rp))
- rp++;
- while (!ISSPACE (*rp) && *rp != '\0')
- rp++;
- break;
+ {
+ while (ISSPACE (*rp))
+ rp++;
+ /* Read timezone but perform no conversion. */
+ /* we recognize the format [-+a-zA-Z0-9]{3,} */
+ const char* start_rp = rp;
+ while ((*rp >= 'A' && *rp <= 'Z') || (*rp >= 'a' && *rp <= 'z') || (*rp >= '0' && *rp <= '9'))
+ rp++;
+ if (start_rp+3 < rp)
+ return NULL;
+ }
case 'z':
/* We recognize four formats:
1. Two digits specify hours.
diff --git a/time/tst-strptime.c b/time/tst-strptime.c
index 3dae9e0594..40145cb109 100644
--- a/time/tst-strptime.c
+++ b/time/tst-strptime.c
@@ -48,6 +48,8 @@ static const struct
6, 0, 0, 1 },
{ "en_US.ISO-8859-1", "2000-01-01 08:12:21 PM", "%Y-%m-%d %I:%M:%S %p",
6, 0, 0, 1 },
+ { "en_US.ISO-8859-1", "2000-01-01 08:12:21 AM CST/", "%Y-%m-%d %I:%M:%S %p %Z/",
+ 6, 0, 0, 1},
{ "ja_JP.EUC-JP", "2001 20 \xb7\xee", "%Y %U %a", 1, 140, 4, 21 },
{ "ja_JP.EUC-JP", "2001 21 \xb7\xee", "%Y %W %a", 1, 140, 4, 21 },
/* Most of the languages do not need the declension of the month names
--
2.39.3
next prev parent reply other threads:[~2023-07-24 13:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-14 14:52 Fix %Z parsing in strptime [BZ #16088] Stanley Lancaster
2023-07-14 16:11 ` Paul Eggert
2023-07-18 17:17 ` Stanley Lancaster
2023-07-18 17:22 ` Stanley Lancaster
2023-07-19 2:13 ` Paul Eggert
2023-07-24 13:53 ` Stanley Lancaster [this message]
2023-07-24 16:48 ` [PATCH] Update to %Z fix Paul Eggert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230724135321.12195-1-lancasterharp@gmail.com \
--to=lancasterharp@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).