From: Eric Smith <eric@trueblade.com>
Date: Sat, 23 May 2009 14:38:19 +0000 (+0000)
Subject: Merged revisions 72850 via svnmerge from
X-Git-Tag: 3.0~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d95501d9460f2f809e02c2d5acd7f4e868e36e9;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 72850 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72850 | eric.smith | 2009-05-23 10:23:22 -0400 (Sat, 23 May 2009) | 9 lines

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

  ........
    r72848 | eric.smith | 2009-05-23 09:56:13 -0400 (Sat, 23 May 2009) | 1 line

    Issue 6089: str.format raises SystemError.
  ........
................
---

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index aaed2d411351..c51949f50c19 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -688,6 +688,10 @@ class UnicodeTest(
         self.assertRaises(ValueError, "{:s}".format)
         self.assertRaises(ValueError, "{}".format)
 
+        # issue 6089
+        self.assertRaises(ValueError, "{0[0]x}".format, [None])
+        self.assertRaises(ValueError, "{0[0](10)}".format, [None])
+
         # can't have a replacement on the field name portion
         self.assertRaises(TypeError, '{0[{1}]}'.format, 'abcdefg', 4)
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 2b40d6835b1c..3b8aa9f8e451 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.0.2?
 Core and Builtins
 -----------------
 
+- Issue #6089: Fixed str.format with certain invalid field specifiers
+  that would raise SystemError.
+
 - Issue #5994: the marshal module now has docstrings.
 
 - Issue #5981: Fix two minor inf/nan issues in float.fromhex: (1) inf
diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h
index b8287701fa15..58af393302fc 100644
--- a/Objects/stringlib/string_format.h
+++ b/Objects/stringlib/string_format.h
@@ -329,8 +329,9 @@ FieldNameIterator_next(FieldNameIterator *self, int *is_attribute,
         *name_idx = get_integer(name);
         break;
     default:
-        /* interal error, can't get here */
-        assert(0);
+        /* Invalid character follows ']' */
+        PyErr_SetString(PyExc_ValueError, "Only '.' or '[' may "
+                        "follow ']' in format field specifier");
         return 0;
     }