technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Python: fixed crash if start_response() is called inside iteration.

Browse Source 
The start_response() uses nxt_python_run_ctx, but it was unset right
after the application call.
This commit is contained in:
Valentin Bartenev
2018-03-15 17:10:24 +03:00
parent 6da1207d95
commit cf2767625f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nxt_python_wsgi.c
View File

@@ -353,19 +353,17 @@ nxt_python_run(nxt_task_t *task, nxt_app_rmsg_t *rmsg, nxt_app_wmsg_t *wmsg)
return NXT_ERROR; return NXT_ERROR;
} }
nxt_python_run_ctx = &run_ctx;
PyTuple_SET_ITEM(args, 0, environ); PyTuple_SET_ITEM(args, 0, environ);
Py_INCREF(nxt_py_start_resp_obj); Py_INCREF(nxt_py_start_resp_obj);
PyTuple_SET_ITEM(args, 1, nxt_py_start_resp_obj); PyTuple_SET_ITEM(args, 1, nxt_py_start_resp_obj);
nxt_python_run_ctx = &run_ctx;
result = PyObject_CallObject(nxt_py_application, args); result = PyObject_CallObject(nxt_py_application, args);
Py_DECREF(args); Py_DECREF(args);
nxt_python_run_ctx = NULL;
if (nxt_slow_path(result == NULL)) { if (nxt_slow_path(result == NULL)) {
nxt_log_error(NXT_LOG_ERR, task->log, nxt_log_error(NXT_LOG_ERR, task->log,
"Python failed to call the application"); "Python failed to call the application");
@@ -428,6 +426,7 @@ nxt_python_run(nxt_task_t *task, nxt_app_rmsg_t *rmsg, nxt_app_wmsg_t *wmsg)
} }
Py_DECREF(result); Py_DECREF(result);
nxt_python_run_ctx = NULL;
return NXT_OK; return NXT_OK;
@@ -446,6 +445,7 @@ fail:
} }
Py_DECREF(result); Py_DECREF(result);
nxt_python_run_ctx = NULL;
return NXT_ERROR; return NXT_ERROR;
} }