From 4371f56802813ce17caaad07e4804a9f69245e2a Mon Sep 17 00:00:00 2001 From: Rupa Schomaker Date: Fri, 20 Feb 2009 22:00:24 +0000 Subject: [PATCH] handle case where custom_sql is braindead (no replaceable params) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12204 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/applications/mod_lcr/mod_lcr.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/mod/applications/mod_lcr/mod_lcr.c b/src/mod/applications/mod_lcr/mod_lcr.c index f645cf96b2..841b82b52c 100644 --- a/src/mod/applications/mod_lcr/mod_lcr.c +++ b/src/mod/applications/mod_lcr/mod_lcr.c @@ -321,8 +321,8 @@ static char *expand_digits(switch_memory_pool_t *pool, char *digits) /* format the custom sql */ static char *format_custom_sql(const char *custom_sql, callback_t *cb_struct, const char *digits) { - char * tmpSQL; - char * newSQL; + char * tmpSQL = NULL; + char * newSQL = NULL; switch_channel_t *channel; /* 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) { 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)