kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-8147: [mod_erlang_event] Fix process spawing segfault 

Don't delete spawn reply because it can cause segfault in strncmp, check the flag instead
This commit is contained in:
Tamas Cseke 2015-09-10 11:23:58 +02:00 committed by Michael Jerris
parent 5257ee6521
commit a4e1d4c00a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/event_handlers/mod_erlang_event/handle_msg.c
View File

@ -1224,7 +1224,7 @@ static switch_status_t handle_ref_tuple(listener_t *listener, erlang_msg * msg,
for (iter = switch_core_hash_first(listener->sessions); iter; iter = switch_core_hash_next(&iter)) { for (iter = switch_core_hash_first(listener->sessions); iter; iter = switch_core_hash_next(&iter)) {
switch_core_hash_this(iter, &key, NULL, &val); switch_core_hash_this(iter, &key, NULL, &val);
se = (session_elem_t*)val; se = (session_elem_t*)val;
if (se->spawn_reply && !strncmp(se->spawn_reply->hash, hash, 100)) { if (switch_test_flag(se, LFLAG_WAITING_FOR_PID) && se->spawn_reply && !strncmp(se->spawn_reply->hash, hash, 100)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "found matching session for %s : %s\n", hash, se->uuid_str); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "found matching session for %s : %s\n", hash, se->uuid_str);

1
src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
View File

@ -1583,7 +1583,6 @@ session_elem_t *attach_call_to_spawned_process(listener_t *listener, char *modul
session_element->process.type = ERLANG_PID; session_element->process.type = ERLANG_PID;
memcpy(&session_element->process.pid, p->pid, sizeof(erlang_pid)); memcpy(&session_element->process.pid, p->pid, sizeof(erlang_pid));
session_element->spawn_reply = NULL;
switch_clear_flag_locked(session_element, LFLAG_WAITING_FOR_PID); switch_clear_flag_locked(session_element, LFLAG_WAITING_FOR_PID);