diff options
author | zuul <zuul@gerrit.asterisk.org> | 2016-08-02 10:57:59 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-02 10:57:59 -0500 |
commit | eba0ad457a4bf8dfa662616e15bb21a4f3381da9 (patch) | |
tree | 790940de80d953347c20a729ff4ec280c0702bae | |
parent | 84f0007232c6e245ad9c12b0afe8ba9b40aa2680 (diff) | |
parent | 73bce50ef82c5a61f857ad1af0d63efd4175ac23 (diff) |
Merge "sorcery: Use more compatible regex for local expressions."
-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 dd4ea8886..6059a529d 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 db1fc1ab8..774c9552a 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; } |