kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix ${EXTEN:X} where X < 0 (bug #3572)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-02-19 00:27:52 +00:00
parent ece9341019
commit 9420fee71d
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pbx.c
View File

@@ -817,6 +817,9 @@ static struct ast_exten *pbx_find_extension(struct ast_channel *chan, char *cont
return NULL; return NULL;
} }
/*--- pbx_retrieve_variable: Support for Asterisk built-in variables and
functions in the dialplan
---*/
static void pbx_substitute_variables_temp(struct ast_channel *c, const char *var, char **ret, char *workspace, int workspacelen) static void pbx_substitute_variables_temp(struct ast_channel *c, const char *var, char **ret, char *workspace, int workspacelen)
{ {
char *first,*second; char *first,*second;
@@ -832,7 +835,7 @@ static void pbx_substitute_variables_temp(struct ast_channel *c, const char *var
headp=&c->varshead; headp=&c->varshead;
*ret=NULL; *ret=NULL;
/* Now we have the variable name on cp3 */ /* Now we have the variable name on cp3 */
if (!strncasecmp(var,"LEN(",4)) { if (!strncasecmp(var,"LEN(",4)) { /* ${LEN(<string>)} */
int len=strlen(var); int len=strlen(var);
int len_len=4; int len_len=4;
if (strrchr(var,')')) { if (strrchr(var,')')) {
@@ -845,37 +848,45 @@ static void pbx_substitute_variables_temp(struct ast_channel *c, const char *var
/* length is zero */ /* length is zero */
*ret = "0"; *ret = "0";
} }
} else if ((first=strchr(var,':'))) { } else if ((first=strchr(var,':'))) { /* : Remove characters counting from end or start of string */
strncpy(tmpvar, var, sizeof(tmpvar) - 1); strncpy(tmpvar, var, sizeof(tmpvar) - 1);
first = strchr(tmpvar, ':'); first = strchr(tmpvar, ':');
if (!first) if (!first)
first = tmpvar + strlen(tmpvar); first = tmpvar + strlen(tmpvar);
*first='\0'; *first='\0';
pbx_substitute_variables_temp(c,tmpvar,ret,workspace,workspacelen - 1); pbx_substitute_variables_temp(c,tmpvar,ret,workspace,workspacelen - 1);
if (!(*ret)) return; if (!(*ret))
offset=atoi(first+1); return;
if ((second=strchr(first+1,':'))) { offset=atoi(first+1); /* The number of characters,
positive: remove # of chars from start
negative: keep # of chars from end */
if ((second=strchr(first+1,':'))) {
*second='\0'; *second='\0';
offset2=atoi(second+1); offset2 = atoi(second+1); /* Number of chars to copy */
} else } else if (offset >= 0) {
offset2=strlen(*ret)-offset; offset2 = strlen(*ret)-offset; /* Rest of string */
if (abs(offset)>strlen(*ret)) { } else {
if (offset>=0) offset2 = abs(offset);
}
if (abs(offset) > strlen(*ret)) { /* Offset beyond string */
if (offset >= 0)
offset=strlen(*ret); offset=strlen(*ret);
else else
offset=-strlen(*ret); offset=-strlen(*ret);
} }
if ((offset<0 && offset2>-offset) || (offset>=0 && offset+offset2>strlen(*ret))) { if ((offset < 0 && offset2 > -offset) || (offset >= 0 && offset+offset2 > strlen(*ret))) {
if (offset>=0) if (offset >= 0)
offset2=strlen(*ret)-offset; offset2=strlen(*ret)-offset;
else else
offset2=strlen(*ret)+offset; offset2=strlen(*ret)+offset;
} }
if (offset>=0) if (offset >= 0)
*ret+=offset; *ret += offset;
else else
*ret+=strlen(*ret)+offset; *ret += strlen(*ret)+offset;
(*ret)[offset2] = '\0'; (*ret)[offset2] = '\0'; /* Cut at offset2 position */
} else if (c && !strcmp(var, "CALLERIDNUM")) { } else if (c && !strcmp(var, "CALLERIDNUM")) {
if (c->callerid) if (c->callerid)
strncpy(workspace, c->callerid, workspacelen - 1); strncpy(workspace, c->callerid, workspacelen - 1);