From fcd78874078b5b09be30fe891656949b59b5163c Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 14 Dec 2013 02:45:07 +0000 Subject: util.c: bump stack size in ruby_qsort() * util.c (ruby_qsort): fix potential stack overflow on a large machine. based on the patch by Conrad Irwin at [ruby-core:51816]. [Bug #7772] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ util.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5ee650b19c..a298a58b8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Dec 14 11:44:52 2013 Nobuyoshi Nakada + + * util.c (ruby_qsort): fix potential stack overflow on a large + machine. based on the patch by Conrad Irwin at [ruby-core:51816]. [Bug #7772] + Sat Dec 14 11:25:56 2013 Nobuyoshi Nakada * object.c (rb_mod_const_defined): support nested class path as diff --git a/util.c b/util.c index f6f233b6e4..b0f9030c42 100644 --- a/util.c +++ b/util.c @@ -310,7 +310,9 @@ ruby_qsort(void* base, const size_t nel, const size_t size, cmpfunc_t *cmp, void char *L = base; /* left end of current region */ char *R = (char*)base + size*(nel-1); /* right end of current region */ size_t chklim = 63; /* threshold of ordering element check */ - stack_node stack[32], *top = stack; /* 32 is enough for 32bit CPU */ + enum {size_bits = sizeof(size) * CHAR_BIT}; + stack_node stack[size_bits]; /* enough for size_t size */ + stack_node *top = stack; int mmkind; size_t high, low, n; -- cgit v1.2.3