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

res_ael: Fix pattern matching against literal '+'

Browse Source 
When generating the regular expression that matches against existing
extensions, we need to escape literal characters that can also be
regular expression metacharacters. This was already being done for '*'
but we need to do the same for '+'.

In passing, remove some unreachable code - strcmp() is already run
immediately when entering extension_matches().

ASTERISK-14939 #close
Reported by: klaus3000

Change-Id: I8d2cccb3479168fba1b0a6704c52198b396468f1
This commit is contained in:
Sean Bright
2019-04-11 12:03:07 -04:00
parent cb282d5c17
commit 395c7ed5b7
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/ael/pval.c
View File

@@ -759,10 +759,10 @@ static int extension_matches(pval *here, const char *exten, const char *pattern)
*r++ = '.'; *r++ = '.';
*r++ = '*'; *r++ = '*';
break; break;
case '*': case '*': /* regex metacharacter */
case '+': /* regex metacharacter */
*r++ = '\\'; *r++ = '\\';
*r++ = '*'; /* fall through */
break;
default: default:
*r++ = *p; *r++ = *p;
break; break;
@@ -792,14 +792,9 @@ static int extension_matches(pval *here, const char *exten, const char *pattern)
exten, pattern); */ exten, pattern); */
return 1; return 1;
} }
} else {
if ( strcmp(exten,pattern) == 0 ) {
return 1;
} else
return 0;
} }
return 0;
} }