kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-09 22:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "sorcery: Use more compatible regex for local expressions." into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-08-02 12:21:12 -05:00
committed by Gerrit Code Review
parent 829b4ba8b3 102d28c11a
commit 9d59de79c9
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_sorcery_config.c
View File

@@ -210,6 +210,10 @@ static void sorcery_config_retrieve_regex(const struct ast_sorcery *sorcery, voi
.regex = &expression, .regex = &expression,
}; };
if (ast_strlen_zero(regex)) {
regex = ".";
}
if (!config_objects || regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) { if (!config_objects || regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) {
return; return;
} }

4
res/res_sorcery_memory.c
View File

@@ -188,6 +188,10 @@ static void sorcery_memory_retrieve_regex(const struct ast_sorcery *sorcery, voi
.regex = &expression, .regex = &expression,
}; };
if (ast_strlen_zero(regex)) {
regex = ".";
}
if (regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) { if (regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) {
return; return;
} }