summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-30 09:24:11 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-30 09:24:11 +0000
commitd4baa5b4c182baae367968b6ff444f20cb25aed8 (patch)
treed1896eeef5a2d5520bd43ce1bd60a476efd718d3
parentbbeed77b77c82725d34e5011ce3ba7e981891dc2 (diff)
downloadruby-d4baa5b4c182baae367968b6ff444f20cb25aed8.tar.gz
ruby-d4baa5b4c182baae367968b6ff444f20cb25aed8.tar.xz
ruby-d4baa5b4c182baae367968b6ff444f20cb25aed8.zip
merges r20364 from trunk into ruby_1_9_1.
* ext/gdbm/gdbm.c (rb_gdbm_nextkey): fix memory leak. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/gdbm/gdbm.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b0ca08957..63b145837 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov 26 15:16:07 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * ext/gdbm/gdbm.c (rb_gdbm_nextkey): fix memory leak.
+
Wed Nov 26 03:17:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c (BigDecimal_to_r): raise exception
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 1e8360813..edde0d19a 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -344,6 +344,7 @@ rb_gdbm_nextkey(GDBM_FILE dbm, VALUE keystr)
return Qnil;
str = rb_str_new(key2.dptr, key2.dsize);
+ free(key2.dptr);
OBJ_TAINT(str);
return str;
}