krb5 commit [krb5-1.20]: Fix meridian type in getdate.y
[email protected] Tue, 11 Jul 2023 18:56:49 -0400 (EDT)
| Newsgroups | gmane.comp.encryption.kerberos.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://github.com/krb5/krb5/commit/5c2f26a24235228a436e7a03bb567a1269db71f2 commit 5c2f26a24235228a436e7a03bb567a1269db71f2 Author: Julien Rische <[email protected]> Date: Tue Feb 21 10:03:35 2023 +0100 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>. [[email protected]: edited commit message] (cherry picked from commit 0108d7d7fbb1111c062ac580e69e97103662fc2b) ticket: 9087 version_fixed: 1.20.2 src/kadmin/cli/getdate.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y index b9dceec1e..d14cf963c 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 %%