From 185a5a726c6c08d207ce4ac0ecd4c359c94a0198 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 3 Jul 2011 12:23:33 +0000 Subject: merges r31930 from trunk into ruby_1_9_2. -- * ext/psych/parser.c (parse): release event objects to plug memory leak. Thanks Mark J. Titorenko! git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/psych/parser.c | 1 + version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc2490df3e..1670283334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 6 09:39:43 2011 Aaron Patterson + + * ext/psych/parser.c (parse): release event objects to plug memory + leak. Thanks Mark J. Titorenko! + Tue Dec 21 00:46:20 2010 KOSAKI Motohiro * thread.c (thread_cleanup_func): Don't touch native threading diff --git a/ext/psych/parser.c b/ext/psych/parser.c index 8841766067..a69f2763bc 100644 --- a/ext/psych/parser.c +++ b/ext/psych/parser.c @@ -295,6 +295,7 @@ static VALUE parse(VALUE self, VALUE yaml) done = 1; break; } + yaml_event_delete(&event); } return self; diff --git a/version.h b/version.h index 10a0b90b85..287ac5eb08 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 275 +#define RUBY_PATCHLEVEL 276 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3