Mercurial > cpython-lru_cache-weakref

diff Objects/floatobject.c @ 48818:e39d44adb618 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
issue 3633: Solaris allows fullwidth Unicode digits in isxdigit, so rewrite float.fromhex to only allow ASCII hex digits on all platforms. (Tests for this are already present, but the test_float failures on Solaris hadn't been noticed before.) Reviewed by Antoine Pitrou.
author Mark Dickinson <dickinsm@gmail.com>
date Thu, 21 Aug 2008 21:38:38 +0000
parents 97ba936e8df8
children 974040c8f369
line wrap: on
line diff
--- a/Objects/floatobject.c	Thu Aug 21 20:02:24 2008 +0000
+++ b/Objects/floatobject.c	Thu Aug 21 21:38:38 2008 +0000
@@ -1126,7 +1126,6 @@
 static int
 hex_from_char(char c) {
 	int x;
-	assert(isxdigit(c));
 	switch(c) {
 	case '0':
 		x = 0;
@@ -1355,12 +1354,12 @@
 
 	/* coefficient: <integer> [. <fraction>] */
 	coeff_start = s;
-	while (isxdigit(*s))
+	while (hex_from_char(*s) >= 0)
 		s++;
 	s_store = s;
 	if (*s == '.') {
 		s++;
-		while (isxdigit(*s))
+		while (hex_from_char(*s) >= 0)
 			s++;
 		coeff_end = s-1;
 	}
@@ -1382,10 +1381,10 @@
 		exp_start = s;
 		if (*s == '-' || *s == '+')
 			s++;
-		if (!isdigit(*s))
+		if (!('0' <= *s && *s <= '9'))
 			goto parse_error;
 		s++;
-		while (isdigit(*s))
+		while ('0' <= *s && *s <= '9')
 			s++;
 		exp = strtol(exp_start, NULL, 10);
 	}