Merged revisions 72257 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72257 | mark.dickinson | 2009-05-03 23:33:34 +0100 (Sun, 03 May 2009) | 2 lines

  Don't use PyOS_strnicmp for NaN and Inf detection: it's locale-aware.
........

diff --git a/Python/pystrtod.c b/Python/pystrtod.c
index 66242d80781d23859084ca1c46a6eeafab1ac222..a50d36046a0a8d5e3d0a2bf967b97c97ec7a21e2 100644 (file)
--- a/Python/pystrtod.c
+++ b/Python/pystrtod.c
@@ -63,6 +63,19 @@ _PyOS_ascii_strtod(const char *nptr, char **endptr)
    correctly rounded results.
 */
 
+/* Case-insensitive string match used for nan and inf detection; t should be
+   lower-case.  Returns 1 for a successful match, 0 otherwise. */
+
+static int
+case_insensitive_match(const char *s, const char *t)
+{
+       while(*t && Py_TOLOWER(*s) == *t) {
+               s++;
+               t++;
+       }
+       return *t ? 0 : 1;
+}
+
 double
 _PyOS_ascii_strtod(const char *nptr, char **endptr)
 {
@@ -107,9 +120,9 @@ _PyOS_ascii_strtod(const char *nptr, char **endptr)
 
        /* Parse infinities and nans */
        if (*p == 'i' || *p == 'I') {
-               if (PyOS_strnicmp(p, "inf", 3) == 0) {
+               if (case_insensitive_match(p+1, "nf")) {
                        val = Py_HUGE_VAL;
-                       if (PyOS_strnicmp(p+3, "inity", 5) == 0)
+                       if (case_insensitive_match(p+3, "inity"))
                                fail_pos = (char *)p+8;
                        else
                                fail_pos = (char *)p+3;
@@ -120,7 +133,7 @@ _PyOS_ascii_strtod(const char *nptr, char **endptr)
        }
 #ifdef Py_NAN
        if (*p == 'n' || *p == 'N') {
-               if (PyOS_strnicmp(p, "nan", 3) == 0) {
+               if (case_insensitive_match(p+1, "an")) {
                        val = Py_NAN;
                        fail_pos = (char *)p+3;
                        goto got_val;