upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ac_cv_func_malloc_0_nonnull for malloc(0) check (#1351)

Browse source 
- For #1339, use the standard variable ac_cv_func_malloc_0_nonnull for
  the malloc(0) check during configure; patch from Helmut Grohne.
This commit is contained in:
Yorgos Thessalonikefs 2025-09-29 13:12:27 +02:00 committed by GitHub
parent 843124852f
commit 1e2dc657a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
acx_nlnetlabs.m4
View file

@ -2,7 +2,9 @@
# Copyright 2009, Wouter Wijngaards, NLnet Labs. # Copyright 2009, Wouter Wijngaards, NLnet Labs.
# BSD licensed. # BSD licensed.
# #
# Version 49 # Version 50
# 2025-09-29 add ac_cv_func_malloc_0_nonnull as a cache value for the malloc(0)
# check by ACX_FUNC_MALLOC.
# 2025-09-29 add ACX_CHECK_NONSTRING_ATTRIBUTE, AHX_CONFIG_NONSTRING_ATTRIBUTE. # 2025-09-29 add ACX_CHECK_NONSTRING_ATTRIBUTE, AHX_CONFIG_NONSTRING_ATTRIBUTE.
# 2024-01-16 fix to add -l:libssp.a to -lcrypto link check. # 2024-01-16 fix to add -l:libssp.a to -lcrypto link check.
# and check for getaddrinfo with only header. # and check for getaddrinfo with only header.
@ -1232,8 +1234,9 @@ dnl detect malloc and provide malloc compat prototype.
dnl $1: unique name for compat code dnl $1: unique name for compat code
AC_DEFUN([ACX_FUNC_MALLOC], AC_DEFUN([ACX_FUNC_MALLOC],
[ [
AC_MSG_CHECKING([for GNU libc compatible malloc]) AC_CACHE_CHECK([for GNU libc compatible malloc],[ac_cv_func_malloc_0_nonnull],
AC_RUN_IFELSE([AC_LANG_PROGRAM( [
AC_RUN_IFELSE([AC_LANG_PROGRAM(
[[#if defined STDC_HEADERS || defined HAVE_STDLIB_H [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
#include <stdlib.h> #include <stdlib.h>
#else #else
@ -1241,14 +1244,16 @@ char *malloc ();
#endif #endif
]], [ if(malloc(0) != 0) return 1;]) ]], [ if(malloc(0) != 0) return 1;])
], ],
[AC_MSG_RESULT([no]) [ac_cv_func_malloc_0_nonnull=no],
AC_LIBOBJ(malloc) [ac_cv_func_malloc_0_nonnull=yes],
AC_DEFINE_UNQUOTED([malloc], [rpl_malloc_$1], [Define if replacement function should be used.])] , [ac_cv_func_malloc_0_nonnull="no (crosscompile)"])
[AC_MSG_RESULT([yes]) ])
AC_DEFINE([HAVE_MALLOC], 1, [If have GNU libc compatible malloc])], AS_IF([test "$ac_cv_func_malloc_0_nonnull" = yes],
[AC_MSG_RESULT([no (crosscompile)]) [AC_DEFINE([HAVE_MALLOC], 1, [If have GNU libc compatible malloc])],
AC_LIBOBJ(malloc) [
AC_DEFINE_UNQUOTED([malloc], [rpl_malloc_$1], [Define if replacement function should be used.])] ) AC_LIBOBJ(malloc)
AC_DEFINE_UNQUOTED([malloc], [rpl_malloc_$1], [Define if replacement function should be used.])
])
]) ])
dnl Define fallback for fseeko and ftello if needed. dnl Define fallback for fseeko and ftello if needed.

12
configure.ac
View file

@ -635,19 +635,19 @@ AC_ARG_ENABLE(alloc-nonregional, AS_HELP_STRING([--enable-alloc-nonregional],[ e
if test x_$enable_alloc_nonregional = x_yes; then if test x_$enable_alloc_nonregional = x_yes; then
AC_DEFINE(UNBOUND_ALLOC_NONREGIONAL, 1, [use malloc not regions, for debug use]) AC_DEFINE(UNBOUND_ALLOC_NONREGIONAL, 1, [use malloc not regions, for debug use])
fi fi
if test x_$enable_alloc_checks = x_yes; then AS_IF([test x_$enable_alloc_checks = x_yes],[
AC_DEFINE(UNBOUND_ALLOC_STATS, 1, [use statistics for allocs and frees, for debug use]) AC_DEFINE(UNBOUND_ALLOC_STATS, 1, [use statistics for allocs and frees, for debug use])
SLDNS_ALLOCCHECK_EXTRA_OBJ="alloc.lo log.lo" SLDNS_ALLOCCHECK_EXTRA_OBJ="alloc.lo log.lo"
AC_SUBST(SLDNS_ALLOCCHECK_EXTRA_OBJ) AC_SUBST(SLDNS_ALLOCCHECK_EXTRA_OBJ)
ASYNCLOOK_ALLOCCHECK_EXTRA_OBJ="alloc.lo" ASYNCLOOK_ALLOCCHECK_EXTRA_OBJ="alloc.lo"
AC_SUBST(ASYNCLOOK_ALLOCCHECK_EXTRA_OBJ) AC_SUBST(ASYNCLOOK_ALLOCCHECK_EXTRA_OBJ)
else ],[
if test x_$enable_alloc_lite = x_yes; then AS_IF([test x_$enable_alloc_lite = x_yes],[
AC_DEFINE(UNBOUND_ALLOC_LITE, 1, [use to enable lightweight alloc assertions, for debug use]) AC_DEFINE(UNBOUND_ALLOC_LITE, 1, [use to enable lightweight alloc assertions, for debug use])
else ],[
ACX_FUNC_MALLOC([unbound]) ACX_FUNC_MALLOC([unbound])
fi ])
fi ])
# check windows threads (we use them, not pthreads, on windows). # check windows threads (we use them, not pthreads, on windows).
if test "$on_mingw" = "yes"; then if test "$on_mingw" = "yes"; then