Issue #22906: Do incref before SetCause/SetContext

1st1 · 1st1 · commit 18c30a29f86d · 2015-05-10T15:09:46.000-04:00
diff --git a/Objects/genobject.c b/Objects/genobject.c
@@ -149,9 +149,9 @@ gen_send_ex(PyGenObject *gen, PyObject *arg, int exc)
                 "generator raised StopIteration");
             PyErr_Fetch(&exc, &val2, &tb);
             PyErr_NormalizeException(&exc, &val2, &tb);
+            Py_INCREF(val);
             PyException_SetCause(val2, val);
             PyException_SetContext(val2, val);
-            Py_INCREF(val);
             PyErr_Restore(exc, val2, tb);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -149,9 +149,9 @@ gen_send_ex(PyGenObject gen, PyObject arg, int exc)`
`149`	`149`	`"generator raised StopIteration");`
`150`	`150`	`PyErr_Fetch(&exc, &val2, &tb);`
`151`	`151`	`PyErr_NormalizeException(&exc, &val2, &tb);`
	`152`	`+ Py_INCREF(val);`
`152`	`153`	`PyException_SetCause(val2, val);`
`153`	`154`	`PyException_SetContext(val2, val);`
`154`		`- Py_INCREF(val);`
`155`	`155`	`PyErr_Restore(exc, val2, tb);`
`156`	`156`	`}`
`157`	`157`	`}`