Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

handle case where custom_sql is braindead (no replaceable params)

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12204 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Rupa Schomaker 2009-02-20 22:00:24 +00:00
parent 75dcd9ae2a
commit 4371f56802
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/applications/mod_lcr/mod_lcr.c
View File

@ -321,8 +321,8 @@ static char *expand_digits(switch_memory_pool_t *pool, char *digits)
/* format the custom sql */ /* format the custom sql */
static char *format_custom_sql(const char *custom_sql, callback_t *cb_struct, const char *digits) static char *format_custom_sql(const char *custom_sql, callback_t *cb_struct, const char *digits)
{ {
char * tmpSQL; char * tmpSQL = NULL;
char * newSQL; char * newSQL = NULL;
switch_channel_t *channel; switch_channel_t *channel;
/* first replace %s with digits to maintain backward compat */ /* first replace %s with digits to maintain backward compat */
@ -352,7 +352,12 @@ static char *format_custom_sql(const char *custom_sql, callback_t *cb_struct, co
if(tmpSQL != newSQL) { if(tmpSQL != newSQL) {
switch_safe_free(tmpSQL); switch_safe_free(tmpSQL);
} }
return newSQL;
if(newSQL == NULL) {
return (char *) custom_sql;
} else {
return newSQL;
}
} }
static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata)