From 0c44d66162149f92b79610bda159e93557e460df Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 12 Jan 2014 06:53:41 +0000 Subject: [PATCH] merge revision(s) 44195: [Backport #7772] * 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/branches/ruby_2_0_0@44565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ util.c | 4 +++- version.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f8d1e5992..317315da38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jan 12 15:33:11 2014 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] + Sun Jan 12 15:17:00 2014 Nobuyoshi Nakada * ext/tk/tkutil/tkutil.c: use rb_sprintf(), rb_id2str(), and diff --git a/util.c b/util.c index 8ffa24acdc..5bb0c512bf 100644 --- a/util.c +++ b/util.c @@ -309,7 +309,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; diff --git a/version.h b/version.h index 1e1af27f37..7f5487b50d 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-01-12" -#define RUBY_PATCHLEVEL 379 +#define RUBY_PATCHLEVEL 380 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 1