gilstate = PyGILState_Ensure();
#endif
- ret = PyObject_CallFunction((PyObject*)user_arg, "issss", action, arg1, arg2, dbname, access_attempt_source);
- if (!ret) {
- if (_enable_callback_tracebacks) {
- PyErr_Print();
- } else {
- PyErr_Clear();
- }
+ if (!PyErr_Occurred()) {
+ ret = PyObject_CallFunction((PyObject*)user_arg, "issss", action, arg1, arg2, dbname, access_attempt_source);
+
+ if (!ret) {
+ if (_enable_callback_tracebacks) {
+ PyErr_Print();
+ } else {
+ PyErr_Clear();
+ }
- rc = SQLITE_DENY;
- } else {
- if (PyLong_Check(ret)) {
- rc = _PyLong_AsInt(ret);
- if (rc == -1 && PyErr_Occurred())
- rc = SQLITE_DENY;
- } else {
rc = SQLITE_DENY;
+ } else {
+ if (PyLong_Check(ret)) {
+ rc = _PyLong_AsInt(ret);
+ if (rc == -1 && PyErr_Occurred())
+ rc = SQLITE_DENY;
+ } else {
+ rc = SQLITE_DENY;
+ }
+ Py_DECREF(ret);
}
- Py_DECREF(ret);
+ }
+ else {
+ /* A previous call to the authorizer callback failed and raised an
+ exception: don't call the Python authorizer callback */
+ rc = SQLITE_DENY;
}
#ifdef WITH_THREAD