diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-11 08:01:25 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-11 08:01:25 +0000 |
commit | 9681d8791b4a85e3dc8acb1a7a5e4e7b2c4d1ac8 (patch) | |
tree | c47a23c4fe97cc39fb533f286d43444ff426807b | |
parent | 513d286ed0054491fed7528471ada0040fd227d2 (diff) |
* array.c (rb_ary_replace): should shift lfree pointer before
calling xfree.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | array.c | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Oct 11 16:57:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * array.c (rb_ary_replace): should shift lfree pointer before + calling xfree. + Wed Oct 11 15:07:42 2006 Akinori MUSHA <knu@iDaemons.org> * ext/digest/lib/digest/hmac.rb: Add digest/hmac, which implements @@ -2158,7 +2158,11 @@ rb_ary_replace(VALUE copy, VALUE orig) ARY_SET_NOEMBED(copy); } else { - xfree(RARRAY(copy)->as.heap.ptr); + VALUE *ptr = RARRAY(copy)->as.heap.ptr; + if (ARY_LFREE_P(copy)) { + ptr -= LFREE_SIZE(copy); + } + xfree(ptr); } RARRAY(copy)->as.heap.ptr = RARRAY(shared)->as.heap.ptr; RARRAY(copy)->as.heap.len = RARRAY(shared)->as.heap.len; |