Skip to content

[3.11] gh-97943: PyFunction_GetAnnotations should return a borrowed reference. (GH-97949) #97985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Oct 6, 2022
Merged

[3.11] gh-97943: PyFunction_GetAnnotations should return a borrowed reference. (GH-97949) #97985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
gh-97943: PyFunction_GetAnnotations should return a borrowed referenc… 
…e. (GH-97949)

(cherry picked from commit 6bfb0be)

Co-authored-by: larryhastings <larry@hastings.org>
  • Loading branch information
@larryhastings @miss-islington
larryhastings authored and miss-islington committed Oct 6, 2022
commit dd4bbfb2c63268b644ffbe7876e1de84c9f1e255
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-10-05-17-02-22.gh-issue-97943.LYAWlE.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Bugfix: :func:`PyFunction_GetAnnotations` should return a borrowed
reference. It was returning a new reference.
7 changes: 5 additions & 2 deletions Objects/funcobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,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;
}
Expand Down Expand Up @@ -532,7 +531,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
Expand Down