diff options
| author | Julien Rische <jrische@redhat.com> | 2023-02-21 10:03:35 +0100 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2023-07-06 17:15:02 -0400 |
| commit | 5c2f26a24235228a436e7a03bb567a1269db71f2 (patch) | |
| tree | db8cb86f8ec5c41540d7831a9c7b774ce5ff4b6f | |
| parent | 81a226597d5d92c0c96a063da53a586a7cdd9bb7 (diff) | |
| download | krb5-5c2f26a24235228a436e7a03bb567a1269db71f2.zip krb5-5c2f26a24235228a436e7a03bb567a1269db71f2.tar.gz krb5-5c2f26a24235228a436e7a03bb567a1269db71f2.tar.bz2 | |
Fix meridian type in getdate.y
Commit d3356bc42191c1896ab06835a2fb245e00471420 (ticket 8927)
incorrectly tagged tMERIDIAN as <Number>. So while the lexer assigns
meridian values to the Meridian union field, the parser erroneously
reads them from the Number field. On 64-bit IBM zSystems (s390x),
this can result in using the most recently read number as a meridian
value, leading to an abort in ToSeconds().
Fix the tMERIDIAN token type to be <Meridian>.
[ghudson@mit.edu: edited commit message]
(cherry picked from commit 0108d7d7fbb1111c062ac580e69e97103662fc2b)
ticket: 9087
version_fixed: 1.20.2
| -rw-r--r-- | src/kadmin/cli/getdate.y | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y index b9dceec..d14cf96 100644 --- a/src/kadmin/cli/getdate.y +++ b/src/kadmin/cli/getdate.y @@ -181,7 +181,8 @@ static time_t yyRelSeconds; %token tAGO tID tDST tNEVER %token <Number> tDAY tDAYZONE tMINUTE_UNIT tMONTH tMONTH_UNIT -%token <Number> tSEC_UNIT tSNUMBER tUNUMBER tZONE tMERIDIAN +%token <Number> tSEC_UNIT tSNUMBER tUNUMBER tZONE +%token <Meridian> tMERIDIAN %type <Meridian> o_merid %% |