nmatch may be NULL, too. Closes #868

diff --git a/src/lib/regex.c b/src/lib/regex.c
index a11c49d37b03ed4e62ab47be89488a1d2254f92a..232af70098b58333973767a94014638fef939cac 100644 (file)
--- a/src/lib/regex.c
+++ b/src/lib/regex.c
@@ -152,10 +152,17 @@ int regex_exec(regex_t *preg, char const *subject, size_t len, regmatch_t pmatch
        if (!pmatch || !nmatch) {
                pmatch = NULL;
                if (nmatch) *nmatch = 0;
+               nmatch = NULL;
                matches = 0;
                eflags |= PCRE_NO_AUTO_CAPTURE;
-       } else {
+
+       } else if (nmatch) {
                matches = *nmatch;
+
+       } else {
+               eflags |= PCRE_NO_AUTO_CAPTURE;
+               pmatch = NULL;
+               matches = 0;
        }
 
        ret = pcre_exec(preg->compiled, preg->extra, subject, len, 0, eflags, (int *)pmatch, matches * 3);