diff options
| author | Nikita Sobolev <mail@sobolevn.me> | 2024-03-13 12:38:03 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 12:38:03 (GMT) |
| commit | fcd49b4f47f1edd9a2717f6619da7e7af8ea73cf (patch) | |
| tree | 9c9b725d2f7a409404a2dab0783fba09c74c7540 /Objects/floatobject.c | |
| parent | aa7bcf284f006434b07839d82f325618f7a5c06c (diff) | |
| download | cpython-fcd49b4f47f1edd9a2717f6619da7e7af8ea73cf.zip cpython-fcd49b4f47f1edd9a2717f6619da7e7af8ea73cf.tar.gz cpython-fcd49b4f47f1edd9a2717f6619da7e7af8ea73cf.tar.bz2 | |
gh-116714: Handle errors correctly in `PyFloat_GetInfo` (#116715)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Objects/floatobject.c')
| -rw-r--r-- | Objects/floatobject.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 37d2d31..96227f2 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -98,10 +98,18 @@ PyFloat_GetInfo(void) return NULL; } -#define SetIntFlag(flag) \ - PyStructSequence_SET_ITEM(floatinfo, pos++, PyLong_FromLong(flag)) -#define SetDblFlag(flag) \ - PyStructSequence_SET_ITEM(floatinfo, pos++, PyFloat_FromDouble(flag)) +#define SetFlag(CALL) \ + do { \ + PyObject *flag = (CALL); \ + if (flag == NULL) { \ + Py_CLEAR(floatinfo); \ + return NULL; \ + } \ + PyStructSequence_SET_ITEM(floatinfo, pos++, flag); \ + } while (0) + +#define SetIntFlag(FLAG) SetFlag(PyLong_FromLong((FLAG))) +#define SetDblFlag(FLAG) SetFlag(PyFloat_FromDouble((FLAG))) SetDblFlag(DBL_MAX); SetIntFlag(DBL_MAX_EXP); @@ -116,11 +124,8 @@ PyFloat_GetInfo(void) SetIntFlag(FLT_ROUNDS); #undef SetIntFlag #undef SetDblFlag +#undef SetFlag - if (PyErr_Occurred()) { - Py_CLEAR(floatinfo); - return NULL; - } return floatinfo; } |