kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-16 13:10:05 +00:00
Code Issues Projects Releases Wiki Activity

fix potential locking issue

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7230 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-01-15 00:06:15 +00:00
parent 12b68bf47c
commit 386e65c65e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
View File

@ -38,6 +38,7 @@
#include <curl/curl.h> #include <curl/curl.h>
#endif #endif
static int foo = 0; static int foo = 0;
static switch_mutex_t *mutex;
SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load); SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load);
@ -3404,6 +3405,7 @@ static void js_parse_and_execute(switch_core_session_t *session, const char *inp
JSContext *cx = NULL; JSContext *cx = NULL;
jsval rval; jsval rval;
switch_mutex_lock(mutex);
if ((cx = JS_NewContext(globals.rt, globals.gStackChunkSize))) { if ((cx = JS_NewContext(globals.rt, globals.gStackChunkSize))) {
JS_BeginRequest(cx); JS_BeginRequest(cx);
@ -3423,7 +3425,7 @@ static void js_parse_and_execute(switch_core_session_t *session, const char *inp
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Allocation Error!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Allocation Error!\n");
return; goto end;
} }
script = input_code; script = input_code;
@ -3448,11 +3450,17 @@ static void js_parse_and_execute(switch_core_session_t *session, const char *inp
eval_some_js(buf, cx, javascript_global_object, &rval); eval_some_js(buf, cx, javascript_global_object, &rval);
} }
} }
if (cx) { if (cx) {
eval_some_js(script, cx, javascript_global_object, &rval); eval_some_js(script, cx, javascript_global_object, &rval);
JS_DestroyContext(cx); JS_DestroyContext(cx);
} }
end:
switch_mutex_unlock(mutex);
return;
} }
SWITCH_STANDARD_APP(js_dp_function) SWITCH_STANDARD_APP(js_dp_function)
@ -3579,6 +3587,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load)
curl_global_init(CURL_GLOBAL_ALL); curl_global_init(CURL_GLOBAL_ALL);
switch_mutex_init(&mutex, SWITCH_MUTEX_NESTED, pool);
/* indicate that the module should continue to be loaded */ /* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }