Skip to content
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

Jump to bottom

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

Merged
merged 3 commits into from Mar 5, 2024
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a44fb2
gh-116326: Handler errors correctly in `getwindowsversion` in `sysmod…
sobolevn Mar 5, 2024
021b0d4
Change `PyObject_GetOptionalAttrString` to exc check
sobolevn Mar 5, 2024
736a2e8
Make diff smaller
sobolevn Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 32 additions & 18 deletions Python/sysmodule.c
View file
Open in desktop
Expand Up @@ -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();

Expand All @@ -1599,22 +1602,35 @@ 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
// to accurately identify the OS version. If we fail for any reason,
// 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,
Expand All @@ -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)
Expand Down