git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3226 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2006-10-29 15:36:23 +00:00
parent 800ec12f5b
commit 082a5a03c0
3 changed files with 30 additions and 11 deletions

View File

@@ -1171,7 +1171,7 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
return in;
}
}
nlen = strlen(sub_val);
nlen = sub_val ? strlen(sub_val) : 0;
if (len + nlen >= olen) {
olen += block;
cpos = c - data;
@@ -1186,10 +1186,11 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
vname = data + vvalpos;
}
len += nlen;
strcat(c, sub_val);
c += nlen;
if (nlen) {
len += nlen;
strcat(c, sub_val);
c += nlen;
}
if (func_val) {
free(func_val);
func_val = NULL;