From: Francisco Couzo <franciscouzo@gmail.com>
Date: Sat, 1 Jun 2019 17:14:00 +0000 (-0300)
Subject: Improve exception message for str.format (GH-12675)
X-Git-Tag: v3.8.0b1~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9843bc110dc4241ba7cb05f3d3ef74ac6c77caf2;p=thirdparty%2FPython%2Fcpython.git

Improve exception message for str.format (GH-12675)
---

diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h
index 0fa54eb32cd3..ddf1e2644869 100644
--- a/Objects/stringlib/unicode_format.h
+++ b/Objects/stringlib/unicode_format.h
@@ -440,8 +440,13 @@ get_field_object(SubString *input, PyObject *args, PyObject *kwargs,
 
         /* look up in args */
         obj = PySequence_GetItem(args, index);
-        if (obj == NULL)
-            goto error;
+        if (obj == NULL) {
+            PyErr_Format(PyExc_IndexError,
+                         "Replacement index %zd out of range for positional "
+                         "args tuple",
+                         index);
+             goto error;
+        }
     }
 
     /* iterate over the rest of the field_name */