diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-08-02 12:21:12 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-02 12:21:12 -0500 |
| commit | 9d59de79c9b2d152387cb01a846f93e5aa0cafe8 (patch) | |
| tree | d1815ae4535c40c577664f959eb41fc38fb669fa /res | |
| parent | 829b4ba8b3a5f74f9568adefc41d3ca2ac9876c5 (diff) | |
| parent | 102d28c11a0f74c275613f893e9708b5ab2b4e11 (diff) | |
Merge "sorcery: Use more compatible regex for local expressions." into 13
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_sorcery_config.c | 4 | ||||
| -rw-r--r-- | res/res_sorcery_memory.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/res/res_sorcery_config.c b/res/res_sorcery_config.c index 220b5875f..056f63eaa 100644 --- a/res/res_sorcery_config.c +++ b/res/res_sorcery_config.c @@ -210,6 +210,10 @@ static void sorcery_config_retrieve_regex(const struct ast_sorcery *sorcery, voi .regex = &expression, }; + if (ast_strlen_zero(regex)) { + regex = "."; + } + if (!config_objects || regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) { return; } diff --git a/res/res_sorcery_memory.c b/res/res_sorcery_memory.c index e8f603038..b2f05591b 100644 --- a/res/res_sorcery_memory.c +++ b/res/res_sorcery_memory.c @@ -188,6 +188,10 @@ static void sorcery_memory_retrieve_regex(const struct ast_sorcery *sorcery, voi .regex = &expression, }; + if (ast_strlen_zero(regex)) { + regex = "."; + } + if (regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) { return; } |