From: Eric V. Smith <eric@trueblade.com>
Date: Fri, 5 Feb 2016 23:23:08 +0000 (-0500)
Subject: Fix issue 26287: While handling FORMAT_VALUE opcode, the top of stack was being corru... 
X-Git-Tag: v3.6.0a1~650
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=135d5f49f6da605bb1073f939e826e352a2d655f;p=python

Fix issue 26287: While handling FORMAT_VALUE opcode, the top of stack was being corrupted if an error occurred in PyObject_Format().
---

diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
index d6f781c846..a82dedffe4 100644
--- a/Lib/test/test_fstring.py
+++ b/Lib/test/test_fstring.py
@@ -692,6 +692,17 @@ f'{a * x()}'"""
                              r"f'{a(4]}'",
                             ])
 
+    def test_errors(self):
+        # see issue 26287
+        self.assertAllRaise(TypeError, 'non-empty',
+                            [r"f'{(lambda: 0):x}'",
+                             r"f'{(0,):x}'",
+                             ])
+        self.assertAllRaise(ValueError, 'Unknown format code',
+                            [r"f'{1000:j}'",
+                             r"f'{1000:j}'",
+                            ])
+
     def test_loop(self):
         for i in range(1000):
             self.assertEqual(f'i:{i}', 'i:' + str(i))
diff --git a/Python/ceval.c b/Python/ceval.c
index 743a969f6b..b815ccd9d0 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3383,7 +3383,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
             int have_fmt_spec = (oparg & FVS_MASK) == FVS_HAVE_SPEC;
 
             fmt_spec = have_fmt_spec ? POP() : NULL;
-            value = TOP();
+            value = POP();
 
             /* See if any conversion is specified. */
             switch (which_conversion) {
@@ -3426,7 +3426,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                     goto error;
             }
 
-            SET_TOP(result);
+            PUSH(result);
             DISPATCH();
         }