retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

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

Conflicts:
	src/switch_channel.c
This commit is contained in:
Anthony Minessale 2017-06-05 18:15:18 -05:00 committed by Mike Jerris
parent 595a5fc15a
commit 1eb5ee1a84
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/switch_channel.c
View File

@ -4392,15 +4392,17 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
X = malloc(len); X = malloc(len);
for (i = 0; i < proceed; i++) { 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) {
switch_size_t plen = strlen(replace); if (replace) {
memset(X, 'X', plen); switch_size_t plen = strlen(replace);
*(X+plen) = '\0'; memset(X, 'X', plen);
*(X+plen) = '\0';
switch_safe_free(substituted);
substituted = switch_string_replace(substituted ? substituted : dtstr, replace, X); switch_safe_free(substituted);
substituted = switch_string_replace(substituted ? substituted : dtstr, replace, X);
pcre_free_substring(replace);
pcre_free_substring(replace);
}
} }
} }

21
src/switch_regex.c
View File

@ -174,12 +174,15 @@ SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_c
num = -1; 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) {
switch_size_t r; if (replace) {
for (r = 0; r < strlen(replace) && y < (len - 1); r++) { switch_size_t r;
substituted[y++] = replace[r];
for (r = 0; r < strlen(replace) && y < (len - 1); r++) {
substituted[y++] = replace[r];
}
pcre_free_substring(replace);
} }
pcre_free_substring(replace);
} }
} else { } else {
substituted[y++] = data[x]; substituted[y++] = data[x];
@ -200,9 +203,11 @@ SWITCH_DECLARE(void) switch_capture_regex(switch_regex_t *re, int match_count, c
int i; int i;
for (i = 0; i < match_count; 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) {
callback(var, replace, user_data); if (replace) {
pcre_free_substring(replace); callback(var, replace, user_data);
pcre_free_substring(replace);
}
} }
} }
} }