retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-3137 --resolve less of a memory leak more of a pool swelling, replaced a pool strdup that could recur with a strdup/free to avoid it

This commit is contained in:
Anthony Minessale 2011-04-08 14:04:01 -05:00
parent a909940385
commit bcd6c3a188
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mod/applications/mod_conference/mod_conference.c
View File

@ -1996,22 +1996,20 @@ static void conference_loop_fn_exec_app(conference_member_t *member, caller_cont
switch_event_fire(&event); switch_event_fire(&event);
} }
if ((mydata = switch_core_session_strdup(member->session, action->expanded_data))) { mydata = strdup(action->expanded_data);
if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { switch_assert(mydata);
if (argc > 0) {
app = argv[0];
}
if (argc > 1) {
arg = argv[1];
}
} else { if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Empty execute app string [%s]\n", if (argc > 0) {
(char *) action->expanded_data); app = argv[0];
goto done;
} }
if (argc > 1) {
arg = argv[1];
}
} else { } else {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Unable to allocate memory to duplicate execute_app data.\n"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Empty execute app string [%s]\n",
(char *) action->expanded_data);
goto done; goto done;
} }
@ -2029,8 +2027,11 @@ static void conference_loop_fn_exec_app(conference_member_t *member, caller_cont
switch_core_session_execute_application(member->session, app, arg); switch_core_session_execute_application(member->session, app, arg);
switch_core_session_set_read_codec(member->session, &member->read_codec); switch_core_session_set_read_codec(member->session, &member->read_codec);
switch_channel_clear_app_flag(channel, CF_APP_TAGGED); switch_channel_clear_app_flag(channel, CF_APP_TAGGED);
done: done:
switch_safe_free(mydata);
return; return;
} }