update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3458 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
57dd6da1fe
commit
dd1f941744
|
@ -1196,8 +1196,7 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
|
||||||
return in;
|
return in;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
nlen = sub_val ? strlen(sub_val) : 0;
|
if ((nlen = sub_val ? strlen(sub_val) : 0)) {
|
||||||
|
|
||||||
if (len + nlen >= olen) {
|
if (len + nlen >= olen) {
|
||||||
olen = (olen + len + nlen + block);
|
olen = (olen + len + nlen + block);
|
||||||
cpos = c - data;
|
cpos = c - data;
|
||||||
|
@ -1205,10 +1204,11 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
|
||||||
c = data + cpos;
|
c = data + cpos;
|
||||||
memset(c, 0, olen - cpos);
|
memset(c, 0, olen - cpos);
|
||||||
}
|
}
|
||||||
if (nlen) {
|
|
||||||
len += nlen;
|
len += nlen;
|
||||||
strcat(c, sub_val);
|
strcat(c, sub_val);
|
||||||
c += nlen;
|
c += nlen;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_safe_free(func_val);
|
switch_safe_free(func_val);
|
||||||
|
|
Loading…
Reference in New Issue