diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | util.c | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Dec 14 11:44:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * util.c (ruby_qsort): fix potential stack overflow on a large + machine. based on the patch by Conrad Irwin <conrad.irwin AT + gmail.com> at [ruby-core:51816]. [Bug #7772] + Sat Dec 14 11:25:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * object.c (rb_mod_const_defined): support nested class path as @@ -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; |