fixes overflow for trapv build, now for freescan (overflow in tests c…

…lock-6.10e/clock-6.10f): rewritten with common str2int now
sebres · Mar 24, 2024 · e82c68c · e82c68c
1 parent 6af7804
commit e82c68c
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 60 deletions.
diff --git a/generic/tclClockFmt.c b/generic/tclClockFmt.c
@@ -175,6 +175,16 @@ _str2wideInt(
     return TCL_OK;
 }
 
+int
+TclAtoWIe(
+    Tcl_WideInt *out,
+    const char	*p,
+    const char	*e,
+    int sign)
+{
+    return _str2wideInt(out, p, e, sign);
+}
+
 #if defined(__GNUC__) || defined(__GNUG__)
 # pragma GCC reset_options
 #endif

diff --git a/generic/tclDate.c b/generic/tclDate.c
@@ -222,7 +222,7 @@ extern int TclDatedebug;
 union YYSTYPE
 {
 
-    long long Number;
+    Tcl_WideInt Number;
     enum _MERIDIAN Meridian;
 
 
@@ -2534,44 +2534,40 @@ TclDatelex(
 
 	if (isdigit(UCHAR(c = *yyInput))) { /* INTL: digit */
 
-	    /*
-	     * Convert the string into a number; count the number of digits.
+	    /* 
+	     * Count the number of digits.
 	     */
-	    long long num = c - '0';
 	    p = (char *)yyInput;
-	    while (isdigit(UCHAR(c = *(++p)))) {
-		if (num >= 0) {
-		    num *= 10; num += c - '0';
-		}
-	    }
-	    yylvalPtr->Number = num;
+	    while (isdigit(UCHAR(*++p))) {};
 	    yyDigitCount = p - yyInput;
+	    /*
+	     * A number with 12 or 14 digits is considered an ISO 8601 date.
+	     */
+	    if (yyDigitCount == 14 || yyDigitCount == 12) {
+		/* long form of ISO 8601 (without separator), either
+		 * YYYYMMDDhhmmss or YYYYMMDDhhmm, so reduce to date
+		 * (8 chars is isodate) */
+		p = (char *)yyInput+8;
+		if (TclAtoWIe(&yylvalPtr->Number, yyInput, p, 1) != TCL_OK) {
+		    return tID; /* overflow*/
+		}                
+		yyDigitCount = 8;
+		yyInput = p;
+		location->last_column = yyInput - info->dateStart - 1;
+		return tISOBASL;
+	    }
+	    /* 
+	     * Convert the string into a number
+	     */
+	    if (TclAtoWIe(&yylvalPtr->Number, yyInput, p, 1) != TCL_OK) {
+		return tID; /* overflow*/
+	    }
 	    yyInput = p;
-
 	    /*
 	     * A number with 6 or more digits is considered an ISO 8601 base.
 	     */
-
 	    location->last_column = yyInput - info->dateStart - 1;
 	    if (yyDigitCount >= 6) {
-		if (yyDigitCount == 14 || yyDigitCount == 12) {
-		    /* long form of ISO 8601 (without separator), either
-		     * YYYYMMDDhhmmss or YYYYMMDDhhmm, so reduce to date
-		     * (8 chars is isodate) */
-		    p = (char *)tokStart;
-		    num = *p++ - '0';
-		    do {
-			num *= 10; num += *p++ - '0';
-		    } while (p - tokStart < 8);
-		    yylvalPtr->Number = num;
-		    yyDigitCount = 8;
-		    yyInput = p;
-		    location->last_column = yyInput - info->dateStart - 1;
-		    return tISOBASL;
-		}
-		if (yyDigitCount > 14) { /* overflow */
-		    return tID;
-		}
 		if (yyDigitCount == 8) {
 		    return tISOBAS8;
 		}

diff --git a/generic/tclDate.h b/generic/tclDate.h
@@ -586,6 +586,8 @@ MODULE_SCOPE int    ClockMCSetIdx(ClockFmtScnCmdArgs *opts, int mcKey,
 
 MODULE_SCOPE char *
 	TclItoAw(char *buf, int val, char padchar, unsigned short int width);
+MODULE_SCOPE int
+	TclAtoWIe(Tcl_WideInt *out, const char *p, const char *e, int sign);
 
 MODULE_SCOPE Tcl_Obj*
 		    ClockFrmObjGetLocFmtKey(Tcl_Interp *interp,

diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y
@@ -103,7 +103,7 @@ typedef enum _DSTMODE {
 %}
 
 %union {
-    long long Number;
+    Tcl_WideInt Number;
     enum _MERIDIAN Meridian;
 }
 
@@ -904,44 +904,40 @@ TclDatelex(
 
 	if (isdigit(UCHAR(c = *yyInput))) { /* INTL: digit */
 
-	    /*
-	     * Convert the string into a number; count the number of digits.
+	    /* 
+	     * Count the number of digits.
 	     */
-	    long long num = c - '0';
 	    p = (char *)yyInput;
-	    while (isdigit(UCHAR(c = *(++p)))) {
-		if (num >= 0) {
-		    num *= 10; num += c - '0';
-		}
-	    }
-	    yylvalPtr->Number = num;
+	    while (isdigit(UCHAR(*++p))) {};
 	    yyDigitCount = p - yyInput;
+	    /*
+	     * A number with 12 or 14 digits is considered an ISO 8601 date.
+	     */
+	    if (yyDigitCount == 14 || yyDigitCount == 12) {
+		/* long form of ISO 8601 (without separator), either
+		 * YYYYMMDDhhmmss or YYYYMMDDhhmm, so reduce to date
+		 * (8 chars is isodate) */
+		p = (char *)yyInput+8;
+		if (TclAtoWIe(&yylvalPtr->Number, yyInput, p, 1) != TCL_OK) {
+		    return tID; /* overflow*/
+		}                
+		yyDigitCount = 8;
+		yyInput = p;
+		location->last_column = yyInput - info->dateStart - 1;
+		return tISOBASL;
+	    }
+	    /* 
+	     * Convert the string into a number
+	     */
+	    if (TclAtoWIe(&yylvalPtr->Number, yyInput, p, 1) != TCL_OK) {
+		return tID; /* overflow*/
+	    }
 	    yyInput = p;
-
 	    /*
 	     * A number with 6 or more digits is considered an ISO 8601 base.
 	     */
-
 	    location->last_column = yyInput - info->dateStart - 1;
 	    if (yyDigitCount >= 6) {
-		if (yyDigitCount == 14 || yyDigitCount == 12) {
-		    /* long form of ISO 8601 (without separator), either
-		     * YYYYMMDDhhmmss or YYYYMMDDhhmm, so reduce to date
-		     * (8 chars is isodate) */
-		    p = (char *)tokStart;
-		    num = *p++ - '0';
-		    do {
-			num *= 10; num += *p++ - '0';
-		    } while (p - tokStart < 8);
-		    yylvalPtr->Number = num;
-		    yyDigitCount = 8;
-		    yyInput = p;
-		    location->last_column = yyInput - info->dateStart - 1;
-		    return tISOBASL;
-		}
-		if (yyDigitCount > 14) { /* overflow */
-		    return tID;
-		}
 		if (yyDigitCount == 8) {
 		    return tISOBAS8;
 		}