Skip to content

gh-130824: Add tests for NULL in PyLong_*AndOverflow functions #130828

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
merged 4 commits into from
Mar 5, 2025
Merged

gh-130824: Add tests for NULL in PyLong_*AndOverflow functions #130828

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b15c219
gh-130824: Add tests for NULL in PyLong_*AndOverflow functions
ZeroIntensity Mar 4, 2025
0fc0c21
Apply suggestions from code review
ZeroIntensity Mar 4, 2025
46cd27f
Add check for TypeError
ZeroIntensity Mar 5, 2025
8bb2502
Apply suggestions from code review
ZeroIntensity Mar 5, 2025
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
2 changes: 1 addition & 1 deletion Lib/test/test_capi/test_long.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ def check_long_asintandoverflow(self, func, min_val, max_val):

self.assertEqual(func(min_val - 1), (-1, -1))
self.assertEqual(func(max_val + 1), (-1, +1))
self.assertRaises(SystemError, func, None)

# CRASHES func(1.0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it really crash?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, it doesn't: "If any other exception occurs set *overflow to 0 and return -1 as usual." TypeError will be here.

# CRASHES func(NULL)

def test_long_asint(self):
# Test PyLong_AsInt()
Expand Down
6 changes: 4 additions & 2 deletions Modules/_testlimitedcapi/long.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,8 @@ pylong_aslongandoverflow(PyObject *module, PyObject *arg)
int overflow = UNINITIALIZED_INT;
long value = PyLong_AsLongAndOverflow(arg, &overflow);
if (value == -1 && PyErr_Occurred()) {
assert(overflow == -1);
// overflow can be 0 if a seperate exception occurred
assert(overflow == -1 || overflow == 0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is not it always 0?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not with OverflowError.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, OverflowError is -1 and then other exceptions (only SystemError?) are 0.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only SystemError?

No, TypeError too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OverflowError is not raised. In case of an integer overflow, *overflow should be 1 or -1.

Isn't it always 0 here?

return NULL;
}
return Py_BuildValue("li", value, overflow);
Expand Down Expand Up @@ -671,7 +672,8 @@ pylong_aslonglongandoverflow(PyObject *module, PyObject *arg)
int overflow = UNINITIALIZED_INT;
long long value = PyLong_AsLongLongAndOverflow(arg, &overflow);
if (value == -1 && PyErr_Occurred()) {
assert(overflow == -1);
// overflow can be 0 if a seperate exception occurred
assert(overflow == -1 || overflow == 0);
return NULL;
}
return Py_BuildValue("Li", value, overflow);
Expand Down
Loading