summaryrefslogtreecommitdiff
path: root/Python/sysmodule.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-12-17 15:11:24 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2013-12-17 15:11:24 +0200
commit93ca9bf32ba707d3d1d763292c6652e1c1135bb6 (patch)
tree5328cff23ef019758a90c0db2baa09446826c459 /Python/sysmodule.c
parentd066d57718bb96ebf2b487077a09535ccd3f3d15 (diff)
downloadcpython-93ca9bf32ba707d3d1d763292c6652e1c1135bb6.tar.gz
Issue #16404: Add checks for return value of PyLong_FromLong() in
sys.getwindowsversion() and ossaudiodev.setparameters(). Reported by Ned Batchelder.
Diffstat (limited to 'Python/sysmodule.c')
-rw-r--r--Python/sysmodule.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 880385c9cb..222630c169 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -747,6 +747,10 @@ sys_getwindowsversion(PyObject *self)
PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.wSuiteMask));
PyStructSequence_SET_ITEM(version, pos++, PyLong_FromLong(ver.wProductType));
+ if (PyErr_Occurred()) {
+ Py_DECREF(version);
+ return NULL;
+ }
return version;
}