diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-25 22:58:13 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-25 22:58:13 +0000 |
commit | 94fa180c07049483a57f24dbe2b8dab27f8909df (patch) | |
tree | ac2a573a2e163069bd447074d28fe2eac587abd2 | |
parent | 500a5c34acf968b390f17cb65024858c3930d0c6 (diff) | |
download | ruby-94fa180c07049483a57f24dbe2b8dab27f8909df.tar.gz |
* array.c (rb_ary_shift): should not move memory region if array
body is shared. a patch from Kent Sibilev <ksruby at gmail.com>.
[ruby-core:08922]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11024 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 @@ +Tue Sep 26 07:55:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * array.c (rb_ary_shift): should not move memory region if array + body is shared. a patch from Kent Sibilev <ksruby at gmail.com>. + [ruby-core:08922] + Mon Sep 25 23:10:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * dir.c (rb_push_glob): need not to check by FilePathValue(). @@ -578,7 +578,7 @@ rb_ary_shift(VALUE ary) rb_ary_modify_check(ary); if (RARRAY_LEN(ary) == 0) return Qnil; top = RARRAY_PTR(ary)[0]; - if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) { + if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE && !FL_TEST(ary, ELTS_SHARED)) { MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)); ARY_SET_LEN(ary, RARRAY_LEN(ary)-1); } |