Fix off-by-one error in xalloc_oversized.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 74022b768caf454903ad8caaf43507b08faa7415..0791de9e7186f94f32d1e5a5ad31e8e7796782fe 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-10  Paul Eggert  <eggert@twinsun.com>
+
+       * xalloc.h (xalloc_oversized): [! (defined PTRDIFF_MAX &&
+       PTRDIFF_MAX < SIZE_MAX)]: Fix off-by-one error that would have
+       rejected some allocations of exactly SIZE_MAX - 2 bytes.
+       From Bruno Haible.
+       [defined PTRDIFF_MAX && PTRDIFF_MAX < SIZE_MAX]: Use SIZE_MAX,
+       not (size_t) -1, since it's defined here.
+
 2003-11-06  Paul Eggert  <eggert@twinsun.com>
 
        * xalloc.h [HAVE_STDINT_H]: Include <stdint.h>.

diff --git a/lib/xalloc.h b/lib/xalloc.h
index a09015ff00bd16efd844b0141f63cef14f3de775..571e53c0482e909b58fe00e8e784f5877c1d8188 100644 (file)
--- a/lib/xalloc.h
+++ b/lib/xalloc.h
@@ -68,15 +68,16 @@ char *xstrdup (const char *str);
    works correctly even when SIZE_MAX < N.
 
    By gnulib convention, SIZE_MAX represents overflow in size
-   calculations, so reject attempted allocations of exactly SIZE_MAX
-   bytes.  However, malloc (SIZE_MAX) fails on all known hosts where
+   calculations, so the conservative dividend to use here is
+   SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value.
+   However, malloc (SIZE_MAX) fails on all known hosts where
    PTRDIFF_MAX < SIZE_MAX, so do not bother to test for
    exactly-SIZE_MAX allocations on such hosts; this avoids a test and
    branch when S is known to be 1.  */
 # if defined PTRDIFF_MAX && PTRDIFF_MAX < SIZE_MAX
-#  define xalloc_oversized(n, s) ((size_t) -1 / (s) < (n))
-# else
-#  define xalloc_oversized(n, s) ((size_t) -1 / (s) <= (n))
+#  define xalloc_oversized(n, s) (SIZE_MAX / (s) < (n))
+# else /* SIZE_MAX might not be defined, so avoid (SIZE_MAX - 1).  */
+#  define xalloc_oversized(n, s) ((size_t) -2 / (s) < (n))
 # endif
 
 /* These macros are deprecated; they will go away soon, and are retained