summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYusuke Endoh <mame@ruby-lang.org>2021-09-06 14:22:24 +0900
committerYusuke Endoh <mame@ruby-lang.org>2021-09-06 14:22:24 +0900
commitf336a3eb6c76890f3d8f878725b3d328c8fdcf33 (patch)
treed1478fa271a2e6713be94609fda1bfab644a43cc
parent13dd07e3972fb41c8c834a46e29d34976f478fbc (diff)
downloadruby-f336a3eb6c76890f3d8f878725b3d328c8fdcf33.tar.gz
Use free instead of xfree to free altstack
The altstack memory of a thread may be free'ed even after the VM is destructed. After that, GC is no longer available, so calling xfree may lead to a segfault. This changeset uses the bare free function to free the altstack memory instead of xfree. [Bug #18126]
-rw-r--r--signal.c5
-rw-r--r--vm_core.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/signal.c b/signal.c
index 764031e78a..4ca52b2ee6 100644
--- a/signal.c
+++ b/signal.c
@@ -557,10 +557,13 @@ static int rb_sigaltstack_size_value = 0;
void *
rb_allocate_sigaltstack(void)
{
+ void *altstack;
if (!rb_sigaltstack_size_value) {
rb_sigaltstack_size_value = rb_sigaltstack_size();
}
- return xmalloc(rb_sigaltstack_size_value);
+ altstack = malloc(rb_sigaltstack_size_value);
+ if (!altstack) rb_memerror();
+ return altstack;
}
/* alternate stack for SIGSEGV */
diff --git a/vm_core.h b/vm_core.h
index 5db3080b43..2962356212 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -136,7 +136,7 @@
void *rb_allocate_sigaltstack(void);
void *rb_register_sigaltstack(void *);
# define RB_ALTSTACK_INIT(var, altstack) var = rb_register_sigaltstack(altstack)
-# define RB_ALTSTACK_FREE(var) xfree(var)
+# define RB_ALTSTACK_FREE(var) free(var)
# define RB_ALTSTACK(var) var
#else /* noop */
# define RB_ALTSTACK_INIT(var, altstack)