Merged revisions 67595 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r67595 | mark.dickinson | 2008-12-05 18:10:46 +0000 (Fri, 05 Dec 2008) | 9 lines

  Merged revisions 67590 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r67590 | mark.dickinson | 2008-12-05 17:59:46 +0000 (Fri, 05 Dec 2008) | 2 lines

    Issue #4461: Safety check in parsenumber (ast.c)
  ........
................

diff --git a/Python/ast.c b/Python/ast.c
index 424b601418ed60e95243496e24dc254e90e02c80..aaf158f5c505903e9cc68175d33983a6edcea55c 100644 (file)
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -3137,6 +3137,7 @@ parsenumber(struct compiling *c, const char *s)
     int imflag;
 #endif
 
+    assert(s != NULL);
     errno = 0;
     end = s + strlen(s) - 1;
 #ifndef WITHOUT_COMPLEX