From: Felipe Pena Date: Wed, 27 Feb 2008 01:19:05 +0000 (+0000) Subject: MFB: Improved fix for #44242 X-Git-Tag: BEFORE_NEW_PARAMETER_PARSE~731 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57f73fa8fc21c7eb7e885e58987083f4cbd444f6;p=php MFB: Improved fix for #44242 --- diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c index 34952d8295..21e7cecb8c 100644 --- a/ext/standard/metaphone.c +++ b/ext/standard/metaphone.c @@ -144,7 +144,7 @@ static char Lookahead(char *word, int how_far) * could be one though; or more too). */ #define Phonize(c) { \ if (p_idx >= max_buffer_len) { \ - *phoned_word = erealloc(*phoned_word, max_buffer_len + 2); \ + *phoned_word = safe_erealloc(*phoned_word, 2, sizeof(char), max_buffer_len); \ max_buffer_len += 2; \ } \ (*phoned_word)[p_idx++] = c; \ @@ -152,7 +152,7 @@ static char Lookahead(char *word, int how_far) /* Slap a null character on the end of the phoned word */ #define End_Phoned_Word { \ if (p_idx == max_buffer_len) { \ - *phoned_word = erealloc(*phoned_word, max_buffer_len + 1); \ + *phoned_word = safe_erealloc(*phoned_word, 1, sizeof(char), max_buffer_len); \ } \ (*phoned_word)[p_idx] = '\0'; \ }