* variable.c (remove_trace): should not access already freed area.

* variable.c (rb_f_untrace_var): fix memory leak.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 2 deletions

diff --git a/variable.c b/variable.c
index 2347c1e55f..01ca3a7eb4 100644
--- a/variable.c
+++ b/variable.c
@@ -560,7 +560,9 @@ remove_trace(entry)
 	    trace->next = next->next;
 	    free(next);
 	}
-	trace = next;
+	else {
+	    trace = next;
+	}
     }
     entry->trace = t.next;
 }
@@ -592,7 +594,6 @@ rb_f_untrace_var(argc, argv)
 	    trace->removed = 1;
 	    trace = next;
 	}
-	entry->trace = 0;
 
 	if (!entry->block_trace) remove_trace(entry);
 	return ary;