merges r28649 from trunk into ruby_1_9_2.

--
* proc.c (bm_free): fix memory leak.  [ruby-core:30869] [Bug #3466]

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

2 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f675a21b1..813f6b3d6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 15 21:38:31 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (bm_free): fix memory leak.  [ruby-core:30869] [Bug #3466]
+
 Tue Jul 13 12:04:57 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* missing/close.c: keep original errno.
diff --git a/proc.c b/proc.c
index 01d06bf076..7df2ec890b 100644
--- a/proc.c
+++ b/proc.c
@@ -871,6 +871,7 @@ bm_free(void *ptr)
 	xfree(def);
     else if (def->alias_count > 0)
 	def->alias_count--;
+    xfree(ptr);
 }
 
 static size_t