Blame SPECS/ksh-20120801-cve-2019-14868.patch

Packit 992a25
diff --git a/src/cmd/ksh93/sh/arith.c b/src/cmd/ksh93/sh/arith.c
Packit 992a25
--- a/src/cmd/ksh93/sh/arith.c
Packit 992a25
+++ b/src/cmd/ksh93/sh/arith.c
Packit 992a25
@@ -513,21 +513,34 @@ Sfdouble_t sh_strnum(register const char *str, char** ptr, int mode)
Packit 992a25
 	char base=(shp->inarith?0:10), *last;
Packit 992a25
 	if(*str==0)
Packit 992a25
 	{
Packit 992a25
-		if(ptr)
Packit 992a25
-			*ptr = (char*)str;
Packit 992a25
-		return(0);
Packit 992a25
-	}
Packit 992a25
-	errno = 0;
Packit 992a25
-	d = strtonll(str,&last,&base,-1);
Packit 992a25
-	if(*last || errno)
Packit 992a25
-	{
Packit 992a25
-		if(!last || *last!='.' || last[1]!='.')
Packit 992a25
-			d = strval(shp,str,&last,arith,mode);
Packit 992a25
-		if(!ptr && *last && mode>0)
Packit 992a25
-			errormsg(SH_DICT,ERROR_exit(1),e_lexbadchar,*last,str);
Packit 992a25
+		d = 0.0;
Packit 992a25
+		last = (char*)str;
Packit 992a25
+	} else {
Packit 992a25
+		errno = 0;
Packit 992a25
+		d = strtonll(str,&last,&base,-1);
Packit 992a25
+		if (*last && !shp->inarith && sh_isstate(SH_INIT)) {
Packit 992a25
+			// This call is to handle "base#value" literals if we're importing untrusted env vars.
Packit 992a25
+			errno = 0;
Packit 992a25
+			d = strtonll(str, &last, NULL, -1);
Packit 992a25
+		}
Packit 992a25
+
Packit 992a25
+		if(*last || errno)
Packit 992a25
+		{
Packit 992a25
+			if (sh_isstate(SH_INIT)) {
Packit 992a25
+				// Initializing means importing untrusted env vars. Since the string does not appear
Packit 992a25
+				// to be a recognized numeric literal give up. We can't safely call strval() since
Packit 992a25
+				// that allows arbitrary expressions which would create a security vulnerability.
Packit 992a25
+				d = 0.0;
Packit 992a25
+			} else {
Packit 992a25
+				if(!last || *last!='.' || last[1]!='.')
Packit 992a25
+					d = strval(shp,str,&last,arith,mode);
Packit 992a25
+				if(!ptr && *last && mode>0)
Packit 992a25
+					errormsg(SH_DICT,ERROR_exit(1),e_lexbadchar,*last,str);
Packit 992a25
+			}
Packit 992a25
+		} else if (!d && *str=='-') {
Packit 992a25
+			d = -0.0;
Packit 992a25
+		}
Packit 992a25
 	}
Packit 992a25
-	else if (!d && *str=='-')
Packit 992a25
-		d = -0.0;
Packit 992a25
 	if(ptr)
Packit 992a25
 		*ptr = last;
Packit 992a25
 	return(d);