From: Mark Dickinson <dickinsm@gmail.com>
Date: Fri, 5 Dec 2008 18:01:46 +0000 (+0000)
Subject: Merged revisions 67590 via svnmerge from
X-Git-Tag: v2.6.2c1~340
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=514624d29e04a04e211a4e7536f2ebba70ed629a;p=thirdparty%2FPython%2Fcpython.git

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 9d09dfcb23fa..a3fdd8998d1b 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -3177,6 +3177,7 @@ parsenumber(struct compiling *c, const char *s)
         int imflag;
 #endif
 
+        assert(s != NULL);
         errno = 0;
         end = s + strlen(s) - 1;
 #ifndef WITHOUT_COMPLEX