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

mod_directory: fix segfault on failure 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15076 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Mathieu Rene 2009-10-04 07:40:12 +00:00
parent 4073ccc59f
commit 4e440b6e4c
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mod/applications/mod_directory/mod_directory.c
View File

@ -833,10 +833,14 @@ SWITCH_STANDARD_APP(directory_function)
int attempts = 3; int attempts = 3;
char macro[255]; char macro[255];
if (!switch_strlen_zero(data)) { if (switch_strlen_zero(data)) {
mydata = switch_core_session_strdup(session, data); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Missing profile name\n");
argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); return;
} }
mydata = switch_core_session_strdup(session, data);
argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
if (argv[x]) { if (argv[x]) {
profile_name = argv[x++]; profile_name = argv[x++];
} }
@ -845,10 +849,9 @@ SWITCH_STANDARD_APP(directory_function)
domain_name = argv[x++]; domain_name = argv[x++];
} }
if (!(profile = get_profile(profile_name))) { if (!(profile = get_profile(profile_name))) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name);
goto end; return;
} }
populate_database(session, profile, domain_name); populate_database(session, profile, domain_name);
@ -888,15 +891,11 @@ SWITCH_STANDARD_APP(directory_function)
switch_ivr_session_transfer(session, s_param.transfer_to, "XML", domain_name); switch_ivr_session_transfer(session, s_param.transfer_to, "XML", domain_name);
} }
end:
/* Delete all sql entry for this call */ /* Delete all sql entry for this call */
sql = switch_mprintf("delete from directory_search where hostname = '%q' and uuid = '%q'", globals.hostname, switch_core_session_get_uuid(session)); sql = switch_mprintf("delete from directory_search where hostname = '%q' and uuid = '%q'", globals.hostname, switch_core_session_get_uuid(session));
directory_execute_sql(sql, profile->mutex); directory_execute_sql(sql, profile->mutex);
switch_safe_free(sql); switch_safe_free(sql);
profile_rwunlock(profile); profile_rwunlock(profile);
} }
SWITCH_MODULE_LOAD_FUNCTION(mod_directory_load) SWITCH_MODULE_LOAD_FUNCTION(mod_directory_load)
@ -929,7 +928,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_directory_load)
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open db name : %s\n", globals.dbname); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open db name : %s\n", globals.dbname);
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
sql = switch_mprintf("delete from directory_search where hostname = '%q'", globals.hostname); sql = switch_mprintf("delete from directory_search where hostname = '%q'", globals.hostname);