kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-07 22:03:50 +00:00
Code Issues Projects Releases Wiki Activity

skip dialplan args with bad char sequences

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16882 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2010-03-03 18:31:19 +00:00
parent 4a9fc2c731
commit 9819eed509
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/switch_mprintf.h
View File

@ -57,6 +57,7 @@ SWITCH_BEGIN_EXTERN_C
*/ */
SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...); SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...);
SWITCH_DECLARE(char *) switch_vmprintf(const char *zFormat, va_list ap); SWITCH_DECLARE(char *) switch_vmprintf(const char *zFormat, va_list ap);
SWITCH_DECLARE(char *) switch_snprintfv(char *zBuf, int n, const char *zFormat, ...);
SWITCH_END_EXTERN_C SWITCH_END_EXTERN_C
#endif /* SWITCH_MPRINTF_H */ #endif /* SWITCH_MPRINTF_H */

2
src/include/switch_utils.h
View File

@ -104,7 +104,7 @@ static inline int switch_string_has_escaped_data(const char *in)
while (i && *i == '\\') { while (i && *i == '\\') {
i++; i++;
if (*i == '\\' || *i == 'n' || *i == 's' || *i == 't') { if (*i == '\\' || *i == 'n' || *i == 's' || *i == 't' || *i == '\'') {
return 1; return 1;
} }
i = strchr(i, '\\'); i = strchr(i, '\\');

17
src/switch_caller.c
View File

@ -415,6 +415,13 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application_printf(switch_core_
va_end(ap); va_end(ap);
if (data) { if (data) {
char *p;
if ((p = strstr(data, "\\'"))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "App not added, Invalid character sequence in data string [%s]\n", data);
free(data);
return;
}
switch_caller_extension_add_application(session, caller_extension, application_name, data); switch_caller_extension_add_application(session, caller_extension, application_name, data);
free(data); free(data);
} }
@ -426,12 +433,22 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session
const char *application_data) const char *application_data)
{ {
switch_caller_application_t *caller_application = NULL; switch_caller_application_t *caller_application = NULL;
char *p;
switch_assert(session != NULL); switch_assert(session != NULL);
if ((caller_application = switch_core_session_alloc(session, sizeof(switch_caller_application_t))) != 0) { if ((caller_application = switch_core_session_alloc(session, sizeof(switch_caller_application_t))) != 0) {
caller_application->application_name = switch_core_session_strdup(session, application_name); caller_application->application_name = switch_core_session_strdup(session, application_name);
caller_application->application_data = switch_core_session_strdup(session, application_data); caller_application->application_data = switch_core_session_strdup(session, application_data);
if ((p = strstr(caller_application->application_data, "\\'"))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "App not added, Invalid character sequence in data string [%s]\n",
caller_application->application_data);
return;
}
if (!caller_extension->applications) { if (!caller_extension->applications) {
caller_extension->applications = caller_application; caller_extension->applications = caller_application;
} else if (caller_extension->last_application) { } else if (caller_extension->last_application) {

3
src/switch_channel.c
View File

@ -2438,6 +2438,9 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
if (*(p + 1) == '$') { if (*(p + 1) == '$') {
nv = 1; nv = 1;
p++; p++;
} else if (*(p + 1) == '\'') {
p++;
continue;
} else if (*(p + 1) == '\\') { } else if (*(p + 1) == '\\') {
*c++ = *p++; *c++ = *p++;
len++; len++;

3
src/switch_event.c
View File

@ -1395,6 +1395,9 @@ SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const
if (*(p + 1) == '$') { if (*(p + 1) == '$') {
nv = 1; nv = 1;
p++; p++;
} else if (*(p + 1) == '\'') {
p++;
continue;
} else if (*(p + 1) == '\\') { } else if (*(p + 1) == '\\') {
*c++ = *p++; *c++ = *p++;
len++; len++;

28
src/switch_mprintf.c
View File

@ -871,30 +871,6 @@ static void *printf_realloc(void *old, int size)
return realloc(old, size); return realloc(old, size);
} }
/*
** Print into memory. Use the internal %-conversion extensions.
*/
SWITCH_DECLARE(char *) switch_vmprintf(const char *zFormat, va_list ap)
{
char zBase[SWITCH_PRINT_BUF_SIZE];
return base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap);
}
/*
** Print into memory. Use the internal %-conversion extensions.
*/
SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...)
{
va_list ap;
char *z;
char zBase[SWITCH_PRINT_BUF_SIZE];
va_start(ap, zFormat);
z = base_vprintf(printf_realloc, 1, zBase, sizeof(zBase), zFormat, ap);
va_end(ap);
return z;
}
#ifdef __UNUSED__
/* /*
** Print into memory. Omit the internal %-conversion extensions. ** Print into memory. Omit the internal %-conversion extensions.
*/ */
@ -924,7 +900,7 @@ SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...)
** are not able to use a "," as the decimal point in place of "." as ** are not able to use a "," as the decimal point in place of "." as
** specified by some locales. ** specified by some locales.
*/ */
SWITCH_DECLARE(char *) switch_snprintf(int n, char *zBuf, const char *zFormat, ...) SWITCH_DECLARE(char *) switch_snprintfv(char *zBuf, int n, const char *zFormat, ...)
{ {
char *z; char *z;
va_list ap; va_list ap;
@ -934,4 +910,4 @@ SWITCH_DECLARE(char *) switch_snprintf(int n, char *zBuf, const char *zFormat, .
va_end(ap); va_end(ap);
return z; return z;
} }
#endif