From 0c8111213abddc16af5ba21586a4626d4dabe384 Mon Sep 17 00:00:00 2001 From: matz Date: Sun, 1 Oct 2006 14:45:38 +0000 Subject: * array.c (rb_ary_shift): should not move memory region if array body is shared. a patch from Kent Sibilev . [ruby-core:08922] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ array.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cfa44fb02..be38ae455 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,12 @@ Tue Sep 26 15:31:26 2006 NAKAMURA Usaku * {win32,wince}/Makefile.sub (CPP): check predefined value. +Tue Sep 26 07:55:16 2006 Yukihiro Matsumoto + + * array.c (rb_ary_shift): should not move memory region if array + body is shared. a patch from Kent Sibilev . + [ruby-core:08922] + Mon Sep 25 22:26:26 2006 Nobuyoshi Nakada * file.c (rb_path_end): skip root directory. fixed: [ruby-core:08913] diff --git a/array.c b/array.c index 6df82f7fa..2e9d927f6 100644 --- a/array.c +++ b/array.c @@ -501,7 +501,7 @@ rb_ary_shift(ary) rb_ary_modify_check(ary); if (RARRAY(ary)->len == 0) return Qnil; top = RARRAY(ary)->ptr[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)); } else { -- cgit