Bug #1545497: when given an explicit base, int() did ignore NULs
embedded in the string to convert.
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index f7cf811..72b6966 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -729,6 +729,11 @@
self.assertRaises(ValueError, int, '123\0')
self.assertRaises(ValueError, int, '53', 40)
+ # SF bug 1545497: embedded NULs were not detected with
+ # explicit base
+ self.assertRaises(ValueError, int, '123\0', 10)
+ self.assertRaises(ValueError, int, '123\x00 245', 20)
+
x = int('1' * 600)
self.assert_(isinstance(x, long))
diff --git a/Misc/NEWS b/Misc/NEWS
index 605b1d8..cd21eea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
Core and builtins
-----------------
+- Bug #1545497: when given an explicit base, int() did ignore NULs
+ embedded in the string to convert.
+
- Bug #1569998: break inside a try statement (outside a loop) is now
recognized and rejected.
diff --git a/Objects/intobject.c b/Objects/intobject.c
index a4d50be..8aa8d0b 100644
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -987,8 +987,25 @@
return PyInt_FromLong(0L);
if (base == -909)
return PyNumber_Int(x);
- if (PyString_Check(x))
- return PyInt_FromString(PyString_AS_STRING(x), NULL, base);
+ if (PyString_Check(x)) {
+ /* Since PyInt_FromString doesn't have a length parameter,
+ * check here for possible NULs in the string. */
+ char *string = PyString_AS_STRING(x);
+ if (strlen(string) != PyString_Size(x)) {
+ /* create a repr() of the input string,
+ * just like PyInt_FromString does */
+ PyObject *srepr;
+ srepr = PyObject_Repr(x);
+ if (srepr == NULL)
+ return NULL;
+ PyErr_Format(PyExc_ValueError,
+ "invalid literal for int() with base %d: %s",
+ base, PyString_AS_STRING(srepr));
+ Py_DECREF(srepr);
+ return NULL;
+ }
+ return PyInt_FromString(string, NULL, base);
+ }
#ifdef Py_USING_UNICODE
if (PyUnicode_Check(x))
return PyInt_FromUnicode(PyUnicode_AS_UNICODE(x),