Fixes

andywolk · andywolk · commit 54c1364d8033 · 2025-07-15T17:04:43.000+03:00
diff --git a/src/switch_regex.c b/src/switch_regex.c
@@ -49,7 +49,7 @@ SWITCH_DECLARE(int) switch_regex_copy_substring(switch_regex_match_t *match_data
 
 SWITCH_DECLARE(void) switch_regex_match_free(void *data)
 {
-	pcre2_match_context_free(data);
+	pcre2_match_data_free(data);
 
 }
 
@@ -138,8 +138,13 @@ SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expressi
 		switch_regex_safe_free(re);
 	}
 
-	*new_re = (switch_regex_t *)re;
-	*new_match_data = (switch_regex_match_t *)match_data;
+	if (new_re) {
+		*new_re = (switch_regex_t *)re;
+	}
+
+	if (new_match_data) {
+		*new_match_data = (switch_regex_match_t *)match_data;
+	}
 
   end:
 	switch_safe_free(tmp);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ SWITCH_DECLARE(int) switch_regex_copy_substring(switch_regex_match_t *match_data`
`49`	`49`
`50`	`50`	`SWITCH_DECLARE(void) switch_regex_match_free(void *data)`
`51`	`51`	`{`
`52`		`- pcre2_match_context_free(data);`
	`52`	`+ pcre2_match_data_free(data);`
`53`	`53`
`54`	`54`	`}`
`55`	`55`
`@@ -138,8 +138,13 @@ SWITCH_DECLARE(int) switch_regex_perform(const char field, const char expressi`
`138`	`138`	`switch_regex_safe_free(re);`
`139`	`139`	`}`
`140`	`140`
`141`		`- new_re = (switch_regex_t )re;`
`142`		`- new_match_data = (switch_regex_match_t )match_data;`
	`141`	`+ if (new_re) {`
	`142`	`+ new_re = (switch_regex_t )re;`
	`143`	`+ }`
	`144`	`+`
	`145`	`+ if (new_match_data) {`
	`146`	`+ new_match_data = (switch_regex_match_t )match_data;`
	`147`	`+ }`
`143`	`148`
`144`	`149`	`end:`
`145`	`150`	`switch_safe_free(tmp);`