automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@13960 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 503611bbe99bb08082eb5e5305639134cf978e0a..27c457dd43daa75c1e8934862b1620dd8cce6bf4 100644 (file)
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -89,10 +89,9 @@ static char *builtin_function_regex(struct ast_channel *chan, char *cmd, char *d
        /* Regex in quotes */
        arg = strchr(tmp, '"');
        if (arg) {
-               arg++;
-               earg = strrchr(arg, '"');
+               earg = ++arg;
+               strsep(&earg, "\"");
                if (earg) {
-                       *earg++ = '\0';
                        /* Skip over any spaces before the data we are checking */
                        while (*earg == ' ')
                                earg++;