aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-02-07 22:18:33 +0100
committerLudovic Courtès <ludo@gnu.org>2021-02-07 22:28:55 +0100
commita53f711422f63d7e32b8639b968cf00bcc69ffea (patch)
tree287c5f4619e91ad6b38fa713f27741e6b7188531
parent589b6be99634d0c42cf25e1599b2f62b0d8e89f7 (diff)
downloadguix-a53f711422f63d7e32b8639b968cf00bcc69ffea.tar
guix-a53f711422f63d7e32b8639b968cf00bcc69ffea.tar.gz
guile: Do not install Guile/libgc allocators for GMP.
Fixes <https://bugs.gnu.org/46330>. * gnu/packages/aux-files/guile-launcher.c (main): Clear 'scm_install_gmp_memory_functions'.
-rw-r--r--gnu/packages/aux-files/guile-launcher.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/aux-files/guile-launcher.c b/gnu/packages/aux-files/guile-launcher.c
index 1dd5d77e66..47ba069de1 100644
--- a/gnu/packages/aux-files/guile-launcher.c
+++ b/gnu/packages/aux-files/guile-launcher.c
@@ -1,5 +1,5 @@
/* GNU Guix --- Functional package management for GNU
- Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020
+ Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020,2021
Free Software Foundation, Inc.
Copyright (C) 2020 Ludovic Courtès <ludo@gnu.org>
@@ -82,7 +82,11 @@ main (int argc, char **argv)
unsetenv ("GUILE_LOAD_PATH");
unsetenv ("GUILE_LOAD_COMPILED_PATH");
- scm_install_gmp_memory_functions = 1;
+ /* XXX: Do not let GMP allocate via libgc as this can lead to memory
+ corruption in GnuTLS/Nettle since Nettle also uses GMP:
+ <https://issues.guix.gnu.org/46330>. */
+ scm_install_gmp_memory_functions = 0;
+
scm_boot_guile (argc, argv, inner_main, 0);
return 0; /* never reached */
}