]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.8] bpo-39831: Fix a reference leak in PyErr_WarnEx(). (GH-18750) (GH-18761)
authorPablo Galindo <Pablogsal@gmail.com>
Tue, 3 Mar 2020 01:13:10 +0000 (01:13 +0000)
committerGitHub <noreply@github.com>
Tue, 3 Mar 2020 01:13:10 +0000 (01:13 +0000)
(cherry picked from commit 2d2f855)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Python/_warnings.c

index e02d28305126dfbe98d2d7715819a9bb41ac1f85..87269dd4dbc9eef4ae9350ef12af2bf0f28d20c4 100644 (file)
@@ -856,11 +856,11 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno,
         int rc;
 
         if (PyErr_Occurred()) {
-            return 0;
+            goto handle_error;
         }
         *registry = PyDict_New();
         if (*registry == NULL)
-            return 0;
+            goto handle_error;
 
          rc = _PyDict_SetItemId(globals, &PyId___warningregistry__, *registry);
          if (rc < 0)
@@ -890,6 +890,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno,
        dangling reference. */
     Py_XDECREF(*registry);
     Py_XDECREF(*module);
+    Py_XDECREF(*filename);
     return 0;
 }