From 102e7350674f0601ffbe9f28d6c7898dfd42975e Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 4 Jan 2007 17:40:47 +0000 Subject: [PATCH] tidy up on top of last commit git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3906 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_ivr.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/switch_ivr.c b/src/switch_ivr.c index 602c9c6e58..adfc3a3114 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -2341,6 +2341,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess odata = strdup(bridgeto); data = odata; + /* strip leading spaces */ + while (data && *data && *data == ' ') { + data++; + } + if (*data == '{') { vars = data + 1; if (!(data = strchr(data, '}'))) { @@ -2351,7 +2356,17 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess *data++ = '\0'; } - + /* strip leading spaces (again)*/ + while (data && *data && *data == ' ') { + data++; + } + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + status = SWITCH_STATUS_GENERR; + goto done; + } + /* Some channel are created from an originating channel and some aren't so not all outgoing calls have a way to get params so we will normalize dialstring params and channel variables (when there is an originator) into an event that we will use as a pseudo hash to consult for params as needed.