[Emacs-diffs] master 3b9017b: Reject outlandishly-wide bignums

[Paul Eggert]

branch: master
commit 3b9017b5ba6b7041fbf70691092533286cc9b98d
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Reject outlandishly-wide bignums
    
    Do not allow bignums that are so wide that their log base 2
    might not fit into a fixnum, as this will cause problems elsewhere.
    We already have a similar limitation for bool-vectors.
    * src/emacs.c (check_bignum_size, xmalloc_for_gmp): New function.
    (xrealloc_for_gmp): Check for too-large bignum.
    (main): Use xmalloc_for_gmp.
---
 src/emacs.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/emacs.c b/src/emacs.c
index 97205d2..11ee0b8 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -673,14 +673,32 @@ close_output_streams (void)
     _exit (EXIT_FAILURE);
 }
 
-/* Wrapper function for GMP.  */
+/* Memory allocation functions for GMP.  */
+
+static void
+check_bignum_size (size_t size)
+{
+  /* Do not create a bignum whose log base 2 could exceed fixnum range.
+     This way, functions like mpz_popcount return values in fixnum range.
+     It may also help to avoid other problems with outlandish bignums.  */
+  if (MOST_POSITIVE_FIXNUM / CHAR_BIT < size)
+    error ("Integer too large to be represented");
+}
+
+static void * ATTRIBUTE_MALLOC
+xmalloc_for_gmp (size_t size)
+{
+  check_bignum_size (size);
+  return xmalloc (size);
+}
+
 static void *
 xrealloc_for_gmp (void *ptr, size_t ignore, size_t size)
 {
+  check_bignum_size (size);
   return xrealloc (ptr, size);
 }
 
-/* Wrapper function for GMP.  */
 static void
 xfree_for_gmp (void *ptr, size_t ignore)
 {
@@ -785,7 +803,7 @@ main (int argc, char **argv)
   init_standard_fds ();
   atexit (close_output_streams);
 
-  mp_set_memory_functions (xmalloc, xrealloc_for_gmp, xfree_for_gmp);
+  mp_set_memory_functions (xmalloc_for_gmp, xrealloc_for_gmp, xfree_for_gmp);
 
   sort_args (argc, argv);
   argc = 0;