FS-10240: [freeswitch-core] Use the "Negative Lookahead" in xml dialplan cause memory leak #resolve

src/switch_channel.c

@@ -4405,7 +4405,8 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
 				X = malloc(len);
 
 				for (i = 0; i < proceed; i++) {
-					if (pcre_get_substring(dtstr, ovector, proceed, i, &replace) > 0) {
+					if (pcre_get_substring(dtstr, ovector, proceed, i, &replace) >= 0) {
+						if (replace) {
 							switch_size_t plen = strlen(replace);
 							memset(X, 'X', plen);
 							*(X+plen) = '\0';
@@ -4416,6 +4417,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
 							pcre_free_substring(replace);
 						}
 					}
+				}
 
 				if (!zstr(substituted)) {
 					digit_string = substituted;

src/switch_regex.c

@@ -174,13 +174,16 @@ SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_c
 				num = -1;
 			}
 
-			if (pcre_get_substring(field_data, ovector, match_count, num, &replace) > 0) {
+			if (pcre_get_substring(field_data, ovector, match_count, num, &replace) >= 0) {
+				if (replace) {
 					switch_size_t r;
+
 					for (r = 0; r < strlen(replace) && y < (len - 1); r++) {
 						substituted[y++] = replace[r];
 					}
 					pcre_free_substring(replace);
 				}
+			}
 		} else {
 			substituted[y++] = data[x];
 			x++;
@@ -200,11 +203,13 @@ SWITCH_DECLARE(void) switch_capture_regex(switch_regex_t *re, int match_count, c
 	int i;
 
 	for (i = 0; i < match_count; i++) {
-		if (pcre_get_substring(field_data, ovector, match_count, i, &replace) > 0) {
+		if (pcre_get_substring(field_data, ovector, match_count, i, &replace) >= 0) {
+			if (replace) {
 				callback(var, replace, user_data);
 				pcre_free_substring(replace);
 			}
 		}
+	}
 }
 
 SWITCH_DECLARE(switch_status_t) switch_regex_match_partial(const char *target, const char *expression, int *partial)