Skip to content

GH-98897: fix memory leak if math.dist raises exception #98898

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
rhettinger merged 6 commits into from
Nov 1, 2022
Merged

GH-98897: fix memory leak if math.dist raises exception #98898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5bbb7b
fix memory leak
kumaraditya303 Oct 31, 2022
9fd2cbd
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 31, 2022
17e6c08
add test
kumaraditya303 Oct 31, 2022
1f8f3a5
Merge branch 'math-dist' of https://github.com/kumaraditya303/cpython…
kumaraditya303 Oct 31, 2022
4deccb3
code review
kumaraditya303 Oct 31, 2022
c9beebe
fix imports
kumaraditya303 Oct 31, 2022
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
5 changes: 5 additions & 0 deletions Lib/test/test_math.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,11 @@ class T(tuple):
self.assertEqual(math.dist(p, q), 5*scale)
self.assertEqual(math.dist(q, p), 5*scale)

def test_math_dist_leak(self):
# gh-98897: Check for error handling does not leak memory
with self.assertRaises(ValueError):
math.dist([1, 2], [3, 4, 5])

def testIsqrt(self):
# Test a variety of inputs, large and small.
test_values = (
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2022-10-31-12-34-03.gh-issue-98897.rgNn4x.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix memory leak in :func:`math.dist` when both points don't have the same dimension. Patch by Kumar Aditya.
6 changes: 3 additions & 3 deletions Modules/mathmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2717,13 +2717,13 @@ math_dist_impl(PyObject *module, PyObject *p, PyObject *q)
if (m != n) {
PyErr_SetString(PyExc_ValueError,
"both points must have the same number of dimensions");
return NULL;

goto error_exit;
}
if (n > NUM_STACK_ELEMS) {
diffs = (double *) PyObject_Malloc(n * sizeof(double));
if (diffs == NULL) {
return PyErr_NoMemory();
PyErr_NoMemory();
goto error_exit;
}
}
for (i=0 ; i<n ; i++) {
Expand Down