kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-03 20:00:26 +00:00
Code Issues Projects Releases Wiki Activity

FS-3194 see comitted patch. I made the function assert rather than tolerate NULL and fixed the imporper usage.

Browse Source
This commit is contained in:
Anthony Minessale 2011-03-28 09:49:48 -05:00
parent 7bee6d3d77
commit 484a397d88
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/switch_utils.h
View File

@ -151,7 +151,11 @@ static inline char *switch_strchr_strict(const char *in, char find, const char *
#endif #endif
static inline int switch_string_has_escaped_data(const char *in) static inline int switch_string_has_escaped_data(const char *in)
{ {
const char *i = strchr(in, '\\'); const char *i;
switch_assert(in);
i = strchr(in, '\\');
while (i && *i == '\\') { while (i && *i == '\\') {
i++; i++;

4
src/switch_event.c
View File

@ -1565,6 +1565,10 @@ SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const
int nv = 0; int nv = 0;
char *gvar = NULL; char *gvar = NULL;
if (zstr(in)) {
return (char *) in;
}
nv = switch_string_var_check_const(in) || switch_string_has_escaped_data(in); nv = switch_string_var_check_const(in) || switch_string_has_escaped_data(in);
if (!nv) { if (!nv) {