Skip to content

Replace reallocarray with safe_perealloc #9593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2022
Merged

Replace reallocarray with safe_perealloc #9593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 0 additions & 8 deletions main/php.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
39 changes: 0 additions & 39 deletions main/reallocarray.c
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion sapi/fpm/fpm/fpm_arrays.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down