From: Mark Dickinson <dickinsm@gmail.com>
Date: Thu, 21 Aug 2008 21:38:38 +0000 (+0000)
Subject: issue 3633: Solaris allows fullwidth Unicode digits in isxdigit, so
X-Git-Tag: v2.6rc1~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c2bb1a7d43b630efa9e12959d129a56bc7b615e;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index f70771ee60f3..0b067eb37c4b 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1126,7 +1126,6 @@ char_from_hex(int x)
 static int
 hex_from_char(char c) {
 	int x;
-	assert(isxdigit(c));
 	switch(c) {
 	case '0':
 		x = 0;
@@ -1355,12 +1354,12 @@ float_fromhex(PyObject *cls, PyObject *arg)
 
 	/* 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 @@ float_fromhex(PyObject *cls, PyObject *arg)
 		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);
 	}