Replace reallocarray with safe_perealloc (#9593)

Author: iluuu1994

configure.ac

@@ -695,7 +695,7 @@ if test "$ac_cv_func_getaddrinfo" = yes; then
   AC_DEFINE(HAVE_GETADDRINFO,1,[Define if you have the getaddrinfo function])
 fi
 
-AC_REPLACE_FUNCS(strlcat strlcpy explicit_bzero getopt reallocarray)
+AC_REPLACE_FUNCS(strlcat strlcpy explicit_bzero getopt)
 AC_FUNC_ALLOCA
 PHP_TIME_R_TYPE
 PHP_CHECK_IN_ADDR_T
@@ -1622,7 +1622,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c \
        php_ini_builder.c \
        php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
        strlcat.c explicit_bzero.c reentrancy.c php_variables.c php_ticks.c \
-       network.c php_open_temporary_file.c php_odbc_utils.c safe_bcmp.c reallocarray.c \
+       network.c php_open_temporary_file.c php_odbc_utils.c safe_bcmp.c \
        output.c getopt.c php_syslog.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
 PHP_ADD_SOURCES_X(main, fastcgi.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1, PHP_FASTCGI_OBJS, no)

main/php.h

@@ -179,14 +179,6 @@ END_EXTERN_C()
 #define explicit_bzero php_explicit_bzero
 #endif
 
-#ifndef HAVE_REALLOCARRAY
-BEGIN_EXTERN_C()
-PHPAPI void* php_reallocarray(void *p, size_t nmb, size_t siz);
-END_EXTERN_C()
-#undef reallocarray
-#define reallocarray php_reallocarray
-#endif
-
 BEGIN_EXTERN_C()
 PHPAPI int php_safe_bcmp(const zend_string *a, const zend_string *b);
 END_EXTERN_C()

main/reallocarray.c

@@ -86,7 +86,7 @@ static inline void *fpm_array_push(struct fpm_array_s *a) /* {{{ */
 
 	if (a->used == a->allocated) {
 		size_t new_allocated = a->allocated ? a->allocated * 2 : 20;
-		void *new_ptr = reallocarray(a->data, a->sz, new_allocated);
+		void *new_ptr = safe_perealloc(a->data, a->sz, new_allocated, 0, true);
 
 		if (!new_ptr) {
 			return 0;