]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.10] gh-97943: PyFunction_GetAnnotations should return a borrowed reference. (GH...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Fri, 7 Oct 2022 00:59:09 +0000 (17:59 -0700)
committerGitHub <noreply@github.com>
Fri, 7 Oct 2022 00:59:09 +0000 (17:59 -0700)
gh-97943: PyFunction_GetAnnotations should return a borrowed reference. (GH-97949)
(cherry picked from commit 6bfb0be80486c614cd60dce44c9fe7b3e6c76e3b)

Co-authored-by: larryhastings <larry@hastings.org>
Misc/NEWS.d/next/Core and Builtins/2022-10-05-17-02-22.gh-issue-97943.LYAWlE.rst [new file with mode: 0644]
Objects/funcobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-10-05-17-02-22.gh-issue-97943.LYAWlE.rst b/Misc/NEWS.d/next/Core and Builtins/2022-10-05-17-02-22.gh-issue-97943.LYAWlE.rst
new file mode 100644 (file)
index 0000000..9b4a421
--- /dev/null
@@ -0,0 +1,2 @@
+Bugfix: :func:`PyFunction_GetAnnotations` should return a borrowed
+reference. It was returning a new reference.
index 801478ade22f6b0b95f07ed3bfa7424eddc42545..eaf73339246644e8b4baedc4656a2805bc635bc4 100644 (file)
@@ -247,7 +247,6 @@ func_get_annotation_dict(PyFunctionObject *op)
         }
         Py_SETREF(op->func_annotations, ann_dict);
     }
-    Py_INCREF(op->func_annotations);
     assert(PyDict_Check(op->func_annotations));
     return op->func_annotations;
 }
@@ -474,7 +473,11 @@ func_get_annotations(PyFunctionObject *op, void *Py_UNUSED(ignored))
         if (op->func_annotations == NULL)
             return NULL;
     }
-    return func_get_annotation_dict(op);
+    PyObject *d = func_get_annotation_dict(op);
+    if (d) {
+        Py_INCREF(d);
+    }
+    return d;
 }
 
 static int