diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-13 15:12:56 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-13 15:12:56 +0000 |
| commit | d5d43dc911598d8a3046d9cb069e2b4d28824aa3 (patch) | |
| tree | fe2111f9afa0f9d2a10dd85b4760f7f10c5acd6d | |
| parent | 056c53c0da5d201c7dd661ddf0e682c2c7f51f87 (diff) | |
| download | ruby-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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | array.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Jul 14 00:10:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * array.c (rb_ary_pop): may cause realloc oscillation. a patch + from MORITA Naoyuki <mlgetter at kidou.sakura.ne.jp>. + [ruby-dev:29028] + Thu Jul 13 22:23:56 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/tk/composite.rb: improve handling of the classname on the @@ -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); |