mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
gh-116714: Handle errors correctly in PyFloat_GetInfo
(#116715)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
parent
aa7bcf284f
commit
fcd49b4f47
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue