From 0108d7d7fbb1111c062ac580e69e97103662fc2b Mon Sep 17 00:00:00 2001 From: Julien Rische Date: Tue, 21 Feb 2023 10:03:35 +0100 Subject: Fix meridian type in getdate.y Commit d3356bc42191c1896ab06835a2fb245e00471420 (ticket 8927) incorrectly tagged tMERIDIAN as . 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 . [ghudson@mit.edu: edited commit message] ticket: 9087 (new) tags: pullup target_version: 1.20-next --- 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 tDAY tDAYZONE tMINUTE_UNIT tMONTH tMONTH_UNIT -%token tSEC_UNIT tSNUMBER tUNUMBER tZONE tMERIDIAN +%token tSEC_UNIT tSNUMBER tUNUMBER tZONE +%token tMERIDIAN %type o_merid %% -- cgit v1.2.1