kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_ael: Fix pattern matching against literal '+'" into 13

Browse Source
This commit is contained in:
Joshua Colp
2019-04-16 07:25:32 -05:00
committed by Gerrit Code Review
parent e61e436b38 f66f21895f
commit 2a0e47e9cb
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

@@ -760,10 +760,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;
@@ -793,14 +793,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;
} }