diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-03 12:23:33 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-03 12:23:33 +0000 |
commit | 185a5a726c6c08d207ce4ac0ecd4c359c94a0198 (patch) | |
tree | 51a99942ef40256aaeae223c080a958ea6dac629 | |
parent | 4ca870d0c4c45b58fdf9957b673db0f7190e1afa (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/psych/parser.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Jun 6 09:39:43 2011 Aaron Patterson <aaron@tenderlovemaking.com> + + * 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 <kosaki.motohiro@gmail.com> * 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; @@ -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 |