languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-05 02:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[3.12] gh-116326: Handler errors correctly in getwindowsversion in sysmodule (GH-116339) (#116354)

Browse source 
* gh-116326: Handler errors correctly in `getwindowsversion` in `sysmodule` (GH-116339)
(cherry picked from commit c91bdf86ef)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
This commit is contained in:
Miss Islington (bot) 2024-03-05 16:52:15 +01:00 committed by GitHub
parent 6264c4f4b2
commit 9a42cfa368
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Python/sysmodule.c
View file

@ -1588,6 +1588,9 @@ sys_getwindowsversion_impl(PyObject *module)
if (version && PyObject_TypeCheck(version, &WindowsVersionType)) {
return version;
}
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
return NULL;
}
Py_XDECREF(version);
PyErr_Clear();
@ -1599,15 +1602,24 @@ sys_getwindowsversion_impl(PyObject *module)
if (version == NULL)
return NULL;
PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.dwMajorVersion));
PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.dwMinorVersion));
PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.dwBuildNumber));
PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.dwPlatformId));
PyStructSequence_SET_ITEM(version, pos++, PyUnicode_FromWideChar(ver.szCSDVersion, -1));
PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.wServicePackMajor));
PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.wServicePackMinor));
PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.wSuiteMask));
PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.wProductType));
#define SET_VERSION_INFO(CALL) \
do { \
PyObject *item = (CALL); \
if (item == NULL) { \
goto error; \
} \
PyStructSequence_SET_ITEM(version, pos++, item); \
} while(0)
SET_VERSION_INFO(PyLong_FromLong(ver.dwMajorVersion));
SET_VERSION_INFO(PyLong_FromLong(ver.dwMinorVersion));
SET_VERSION_INFO(PyLong_FromLong(ver.dwBuildNumber));
SET_VERSION_INFO(PyLong_FromLong(ver.dwPlatformId));
SET_VERSION_INFO(PyUnicode_FromWideChar(ver.szCSDVersion, -1));
SET_VERSION_INFO(PyLong_FromLong(ver.wServicePackMajor));
SET_VERSION_INFO(PyLong_FromLong(ver.wServicePackMinor));
SET_VERSION_INFO(PyLong_FromLong(ver.wSuiteMask));
SET_VERSION_INFO(PyLong_FromLong(ver.wProductType));
// GetVersion will lie if we are running in a compatibility mode.
// We need to read the version info from a system file resource
@ -1615,6 +1627,10 @@ sys_getwindowsversion_impl(PyObject *module)
// just return whatever GetVersion said.
PyObject *realVersion = _sys_getwindowsversion_from_kernel32();
if (!realVersion) {
if (!PyErr_ExceptionMatches(PyExc_WindowsError)) {
return NULL;
}
PyErr_Clear();
realVersion = Py_BuildValue("(kkk)",
ver.dwMajorVersion,
@ -1623,21 +1639,19 @@ sys_getwindowsversion_impl(PyObject *module)
);
}
if (realVersion) {
PyStructSequence_SET_ITEM(version, pos++, realVersion);
}
SET_VERSION_INFO(realVersion);
if (PyErr_Occurred()) {
Py_DECREF(version);
return NULL;
}
#undef SET_VERSION_INFO
if (PyObject_SetAttrString(module, "_cached_windows_version", version) < 0) {
Py_DECREF(version);
return NULL;
goto error;
}
return version;
error:
Py_DECREF(version);
return NULL;
}
#pragma warning(pop)