Skip to content

C
cpython
Commit cddfc873 authored by Just van Rossum's avatar Just van Rossum
Browse files
Options

Added proper error checking in event callback handler

parent ff3a69c4
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 24 deletions
Mac/Modules/carbonevt/CarbonEvtsupport.py
View file @ cddfc873
...@@ -64,10 +64,10 @@ includestuff = r""" ...@@ -64,10 +64,10 @@ includestuff = r"""
/* Macro to test whether a weak-loaded CFM function exists */ /* Macro to test whether a weak-loaded CFM function exists */
#define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
PyErr_SetString(PyExc_NotImplementedError, \ PyErr_SetString(PyExc_NotImplementedError, \
"Not available in this shared library/OS version"); \ "Not available in this shared library/OS version"); \
return; \ return; \
}} while(0) }} while(0)
#define USE_MAC_MP_MULTITHREADING 0 #define USE_MAC_MP_MULTITHREADING 0
...@@ -145,24 +145,37 @@ EventHotKeyID_Convert(PyObject *v, EventHotKeyID *out) ...@@ -145,24 +145,37 @@ EventHotKeyID_Convert(PyObject *v, EventHotKeyID *out)
static EventHandlerUPP myEventHandlerUPP; static EventHandlerUPP myEventHandlerUPP;
pascal OSStatus myEventHandler(EventHandlerCallRef handlerRef, EventRef event, void *outPyObject) { static pascal OSStatus
myEventHandler(EventHandlerCallRef handlerRef, EventRef event, void *outPyObject) {
PyObject *retValue; PyObject *retValue;
int status; int status;
#if USE_MAC_MP_MULTITHREADING #if USE_MAC_MP_MULTITHREADING
MPEnterCriticalRegion(reentrantLock, kDurationForever); MPEnterCriticalRegion(reentrantLock, kDurationForever);
PyEval_RestoreThread(_save); PyEval_RestoreThread(_save);
#endif /* USE_MAC_MP_MULTITHREADING */ #endif /* USE_MAC_MP_MULTITHREADING */
retValue = PyObject_CallFunction((PyObject *)outPyObject, "O&O&", EventHandlerCallRef_New, handlerRef, EventRef_New, event); retValue = PyObject_CallFunction((PyObject *)outPyObject, "O&O&", EventHandlerCallRef_New, handlerRef, EventRef_New, event);
status = PyInt_AsLong(retValue); if (retValue == NULL) {
PySys_WriteStderr("Error in event handler callback:\n");
PyErr_Print(); /* this also clears the error */
status = noErr; /* complain? how? */
} else {
if (retValue == Py_None)
status = noErr;
else if (PyInt_Check(retValue)) {
status = PyInt_AsLong(retValue);
} else
status = noErr; /* wrong object type, complain? */
Py_DECREF(retValue);
}
#if USE_MAC_MP_MULTITHREADING #if USE_MAC_MP_MULTITHREADING
_save = PyEval_SaveThread(); _save = PyEval_SaveThread();
MPExitCriticalRegion(reentrantLock); MPExitCriticalRegion(reentrantLock);
#endif /* USE_MAC_MP_MULTITHREADING */ #endif /* USE_MAC_MP_MULTITHREADING */
return status; return status;
} }
/******** end myEventHandler ***********/ /******** end myEventHandler ***********/
......
Mac/Modules/carbonevt/_CarbonEvtmodule.c
View file @ cddfc873
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
/* Macro to test whether a weak-loaded CFM function exists */ /* Macro to test whether a weak-loaded CFM function exists */
#define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
PyErr_SetString(PyExc_NotImplementedError, \ PyErr_SetString(PyExc_NotImplementedError, \
"Not available in this shared library/OS version"); \ "Not available in this shared library/OS version"); \
return; \ return; \
}} while(0) }} while(0)
#define USE_MAC_MP_MULTITHREADING 0 #define USE_MAC_MP_MULTITHREADING 0
...@@ -96,24 +96,37 @@ EventHotKeyID_Convert(PyObject *v, EventHotKeyID *out) ...@@ -96,24 +96,37 @@ EventHotKeyID_Convert(PyObject *v, EventHotKeyID *out)
static EventHandlerUPP myEventHandlerUPP; static EventHandlerUPP myEventHandlerUPP;
pascal OSStatus myEventHandler(EventHandlerCallRef handlerRef, EventRef event, void *outPyObject) { static pascal OSStatus
myEventHandler(EventHandlerCallRef handlerRef, EventRef event, void *outPyObject) {
PyObject *retValue; PyObject *retValue;
int status; int status;
#if USE_MAC_MP_MULTITHREADING #if USE_MAC_MP_MULTITHREADING
MPEnterCriticalRegion(reentrantLock, kDurationForever); MPEnterCriticalRegion(reentrantLock, kDurationForever);
PyEval_RestoreThread(_save); PyEval_RestoreThread(_save);
#endif /* USE_MAC_MP_MULTITHREADING */ #endif /* USE_MAC_MP_MULTITHREADING */
retValue = PyObject_CallFunction((PyObject *)outPyObject, "O&O&", EventHandlerCallRef_New, handlerRef, EventRef_New, event); retValue = PyObject_CallFunction((PyObject *)outPyObject, "O&O&", EventHandlerCallRef_New, handlerRef, EventRef_New, event);
status = PyInt_AsLong(retValue); if (retValue == NULL) {
PySys_WriteStderr("Error in event handler callback:\n");
PyErr_Print(); /* this also clears the error */
status = noErr; /* complain? how? */
} else {
if (retValue == Py_None)
status = noErr;
else if (PyInt_Check(retValue)) {
status = PyInt_AsLong(retValue);
} else
status = noErr; /* wrong object type, complain? */
Py_DECREF(retValue);
}
#if USE_MAC_MP_MULTITHREADING #if USE_MAC_MP_MULTITHREADING
_save = PyEval_SaveThread(); _save = PyEval_SaveThread();
MPExitCriticalRegion(reentrantLock); MPExitCriticalRegion(reentrantLock);
#endif /* USE_MAC_MP_MULTITHREADING */ #endif /* USE_MAC_MP_MULTITHREADING */
return status; return status;
} }
/******** end myEventHandler ***********/ /******** end myEventHandler ***********/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7