diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2004-11-17 23:09:12 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2004-11-17 23:09:12 +0000 |
| commit | 0884570c4e81073738a5bdceb2653f447685a296 (patch) | |
| tree | e67af1d8445f34b494a125e6d6c87cb5d61669c3 /m4 | |
| parent | a18a5093f84d0ef20711af85b7ce0b9392144f27 (diff) | |
| download | coreutils-0884570c4e81073738a5bdceb2653f447685a296.tar.xz | |
Sync from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/calloc.m4 | 35 |
2 files changed, 29 insertions, 11 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 6b030b204..6cd8f6a15 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2004-11-17 Paul Eggert <eggert@cs.ucla.edu> + + * calloc.m4 (_AC_FUNC_CALLOC_IF): Check for buggy calloc implementations + that mishandle size_t overflow. + 2004-11-16 Paul Eggert <eggert@cs.ucla.edu> * canon-host.m4 (gl_CANON_HOST): Check for getaddrinfo. diff --git a/m4/calloc.m4 b/m4/calloc.m4 index 5d03ed271..f244df7b2 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -1,6 +1,25 @@ -#serial 2 +# calloc.m4 serial 3 -# Determine whether calloc (N, S) returns non-NULL when N*S is zero. +# Copyright (C) 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Written by Jim Meyering. + +# Determine whether calloc (N, S) returns non-NULL when N*S is zero, +# and returns NULL when N*S overflows. # If so, define HAVE_CALLOC. Otherwise, define calloc to rpl_calloc # and arrange to use a calloc wrapper function that does work in that case. @@ -9,17 +28,11 @@ # If `calloc (0, 0)' is properly handled, run IF-WORKS, otherwise, IF-NOT. AC_DEFUN([_AC_FUNC_CALLOC_IF], [AC_REQUIRE([AC_HEADER_STDC])dnl +AC_REQUIRE([AC_TYPE_SIZE_T])dnl AC_CHECK_HEADERS(stdlib.h) AC_CACHE_CHECK([for GNU libc compatible calloc], ac_cv_func_calloc_0_nonnull, -[AC_RUN_IFELSE( -[AC_LANG_PROGRAM( -[[#if STDC_HEADERS || HAVE_STDLIB_H -# include <stdlib.h> -#else -char *calloc (); -#endif -]], - [exit (calloc (0, 0) ? 0 : 1);])], +[AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], + [exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));])], [ac_cv_func_calloc_0_nonnull=yes], [ac_cv_func_calloc_0_nonnull=no], [ac_cv_func_calloc_0_nonnull=no])]) |