3b2fdfdcfb
- Add patch from upstream to fix build of Guix with more then two threads: * guile-3.0-fix-compile-crash.patch OBS-URL: https://build.opensuse.org/request/show/787297 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=111
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From 7c17655cd3d859bf0c5a86d9782a7788205fc05a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
|
|
Date: Mon, 9 Mar 2020 15:09:26 +0100
|
|
Subject: Fix incorrect allocation size in 'make-vtable-vtable'.
|
|
|
|
Fixes <https://bugs.gnu.org/39266>.
|
|
Thanks to <https://rr-project.org/> for its help!
|
|
|
|
* libguile/struct.c (set_vtable_access_fields): Fix first argument to
|
|
'scm_gc_malloc_pointerless'.
|
|
---
|
|
libguile/struct.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/libguile/struct.c b/libguile/struct.c
|
|
index 3dbcc71d4..68dcc0070 100644
|
|
--- a/libguile/struct.c
|
|
+++ b/libguile/struct.c
|
|
@@ -1,4 +1,4 @@
|
|
-/* Copyright 1996-2001,2003-2004,2006-2013,2015,2017-2018
|
|
+/* Copyright 1996-2001,2003-2004,2006-2013,2015,2017-2018,2020
|
|
Free Software Foundation, Inc.
|
|
|
|
This file is part of Guile.
|
|
@@ -139,8 +139,10 @@ set_vtable_access_fields (SCM vtable)
|
|
nfields = len / 2;
|
|
|
|
bitmask_size = (nfields + 31U) / 32U;
|
|
- unboxed_fields = scm_gc_malloc_pointerless (bitmask_size, "unboxed fields");
|
|
- memset (unboxed_fields, 0, bitmask_size * sizeof(*unboxed_fields));
|
|
+ unboxed_fields =
|
|
+ scm_gc_malloc_pointerless (bitmask_size * sizeof (*unboxed_fields),
|
|
+ "unboxed fields");
|
|
+ memset (unboxed_fields, 0, bitmask_size * sizeof (*unboxed_fields));
|
|
|
|
/* Update FLAGS according to LAYOUT. */
|
|
for (field = 0; field < nfields; field++)
|
|
--
|
|
cgit v1.2.1
|