From 625cb379f7e77457ca5be94e175d4b71a1d8989f Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Mon, 5 Sep 2016 17:32:28 -0500 Subject: [PATCH] Issue #25387: Check return value of winsound.MessageBeep --- Doc/library/winsound.rst | 3 ++- Misc/NEWS | 2 ++ PC/winsound.c | 12 +++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Doc/library/winsound.rst b/Doc/library/winsound.rst index e72d025b99b..372f792a0f9 100644 --- a/Doc/library/winsound.rst +++ b/Doc/library/winsound.rst @@ -40,7 +40,8 @@ provided by Windows platforms. It includes functions and several constants. sound to play; possible values are ``-1``, ``MB_ICONASTERISK``, ``MB_ICONEXCLAMATION``, ``MB_ICONHAND``, ``MB_ICONQUESTION``, and ``MB_OK``, all described below. The value ``-1`` produces a "simple beep"; this is the final - fallback if a sound cannot be played otherwise. + fallback if a sound cannot be played otherwise. If the system indicates an + error, :exc:`RuntimeError` is raised. .. data:: SND_FILENAME diff --git a/Misc/NEWS b/Misc/NEWS index b13db4604fa..f9abe29807b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -80,6 +80,8 @@ Core and Builtins Library ------- +- Issue #25387: Check return value of winsound.MessageBeep. + - Issue #27866: Add SSLContext.get_ciphers() method to get a list of all enabled ciphers. diff --git a/PC/winsound.c b/PC/winsound.c index 000ddd8475e..7e06b7bd92b 100644 --- a/PC/winsound.c +++ b/PC/winsound.c @@ -175,7 +175,17 @@ static PyObject * winsound_MessageBeep_impl(PyObject *module, int x) /*[clinic end generated code: output=1ad89e4d8d30a957 input=a776c8a85c9853f6]*/ { - MessageBeep(x); + BOOL ok; + + Py_BEGIN_ALLOW_THREADS + ok = MessageBeep(x); + Py_END_ALLOW_THREADS + + if (!ok) { + PyErr_SetExcFromWindowsErr(PyExc_RuntimeError, 0); + return NULL; + } + Py_RETURN_NONE; }