summaryrefslogtreecommitdiffstats
path: root/array.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-13 15:12:56 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-13 15:12:56 +0000
commitd5d43dc911598d8a3046d9cb069e2b4d28824aa3 (patch)
treefe2111f9afa0f9d2a10dd85b4760f7f10c5acd6d /array.c
parent056c53c0da5d201c7dd661ddf0e682c2c7f51f87 (diff)
downloadruby-d5d43dc911598d8a3046d9cb069e2b4d28824aa3.tar.gz
ruby-d5d43dc911598d8a3046d9cb069e2b4d28824aa3.tar.xz
ruby-d5d43dc911598d8a3046d9cb069e2b4d28824aa3.zip
* array.c (rb_ary_pop): may cause realloc oscillation. a patch
from MORITA Naoyuki <mlgetter at kidou.sakura.ne.jp>. [ruby-dev:29028] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/array.c b/array.c
index 708a4900c..5bf0e9979 100644
--- a/array.c
+++ b/array.c
@@ -454,7 +454,7 @@ rb_ary_pop(VALUE ary)
rb_ary_modify_check(ary);
if (RARRAY(ary)->len == 0) return Qnil;
if (!FL_TEST(ary, ELTS_SHARED) &&
- RARRAY(ary)->len * 2 < RARRAY(ary)->aux.capa &&
+ RARRAY(ary)->len * 3 < RARRAY(ary)->aux.capa &&
RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
RARRAY(ary)->aux.capa = RARRAY(ary)->len * 2;
REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);