[Python-checkins] r67600 - in python/branches/release30-maint: Python/ast.c

[mark.dickinson]

Author: mark.dickinson
Date: Fri Dec  5 21:53:19 2008
New Revision: 67600

Log:
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)
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Python/ast.c

Modified: python/branches/release30-maint/Python/ast.c
==============================================================================
--- python/branches/release30-maint/Python/ast.c	(original)
+++ python/branches/release30-maint/Python/ast.c	Fri Dec  5 21:53:19 2008
@@ -3137,6 +3137,7 @@
     int imflag;
 #endif
 
+    assert(s != NULL);
     errno = 0;
     end = s + strlen(s) - 1;
 #ifndef WITHOUT_COMPLEX