fix crash in regexec for nonzero nmatch argument with REG_NOSUB

[musl] / src / regex / regexec.c

diff --git a/src/regex/regexec.c b/src/regex/regexec.c
index 8107aae..2e35b83 100644 (file)
--- a/src/regex/regexec.c
+++ b/src/regex/regexec.c
@@ -977,12 +977,13 @@ tre_fill_pmatch(size_t nmatch, regmatch_t pmatch[], int cflags,
 */
 
 int
-regexec(const regex_t *preg, const char *string,
-         size_t nmatch, regmatch_t pmatch[], int eflags)
+regexec(const regex_t *restrict preg, const char *restrict string,
+         size_t nmatch, regmatch_t pmatch[restrict], int eflags)
 {
   tre_tnfa_t *tnfa = (void *)preg->TRE_REGEX_T_FIELD;
   reg_errcode_t status;
   int *tags = NULL, eo;
+  if (tnfa->cflags & REG_NOSUB) nmatch = 0;
   if (tnfa->num_tags > 0 && nmatch > 0)
     {
       tags = xmalloc(sizeof(*tags) * tnfa->num_tags);