From 272c8d60833cca7af5443469b9c6fd351f686d11 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 7 Aug 2006 03:42:30 +0000 Subject: * parse.y (top_local_setup): local_vars[-1] should point ruby_scope itself to protect local_tbl from garbage collection. [ruby-dev:29049] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ parse.y | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc3894598..ac466de15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,12 @@ Sun Aug 6 20:40:41 2006 Tadayoshi Funaba * lib/date/format.rb (str[fp]time): %[EO]U didn't denote %U. +Sat Aug 5 17:07:43 2006 Yukihiro Matsumoto + + * parse.y (top_local_setup): local_vars[-1] should point + ruby_scope itself to protect local_tbl from garbage collection. + [ruby-dev:29049] + Sat Aug 5 13:54:03 2006 Tadayoshi Funaba * lib/date/format.rb (str[fp]time): "%\n" means "\n". diff --git a/parse.y b/parse.y index 85f054b7b..097a4c7a2 100644 --- a/parse.y +++ b/parse.y @@ -5717,7 +5717,7 @@ top_local_setup() rb_mem_clear(vars+i, len-i); } else { - *vars++ = 0; + *vars++ = (VALUE)ruby_scope; rb_mem_clear(vars, len); } ruby_scope->local_vars = vars; @@ -5732,7 +5732,6 @@ top_local_setup() if (ruby_scope->local_tbl && ruby_scope->local_vars[-1] == 0) { xfree(ruby_scope->local_tbl); } - ruby_scope->local_vars[-1] = 0; ruby_scope->local_tbl = local_tbl(); } } -- cgit