diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-25 19:55:32 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-25 19:55:32 +0000 |
commit | 9e415266a8f373d6752f775ea4a63bf443847d08 (patch) | |
tree | f2dbc579027429a9739a8b1f3a99a8f20033a2af /ext/tk/tkutil | |
parent | 77891d864ffd578e7cb85f065c91ef284a4f7e46 (diff) | |
download | ruby-9e415266a8f373d6752f775ea4a63bf443847d08.tar.gz |
* ext/tk/extconf.rb: fix [ruby-core:28901] [Bug #2997]. Thanks, Michael Graff.
* ext/tk/tcltklib.c: use xfree() for memories allocated by ALLOC().
* ext/tk/tkutil/tkutil.c: ditto.
* ext/tk/lib/tkextlib/version.rb: forgot updating.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/tkutil')
-rw-r--r-- | ext/tk/tkutil/tkutil.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c index 86539ac2e7..ef41bb75a2 100644 --- a/ext/tk/tkutil/tkutil.c +++ b/ext/tk/tkutil/tkutil.c @@ -7,7 +7,7 @@ ************************************************/ -#define TKUTIL_RELEASE_DATE "2010-02-01" +#define TKUTIL_RELEASE_DATE "2010-03-26" #include "ruby.h" @@ -1159,11 +1159,11 @@ subst_free(ptr) if (ptr) { for(i = 0; i < CBSUBST_TBL_MAX; i++) { if (ptr->key[i] != NULL) { - free(ptr->key[i]); + free(ptr->key[i]); /* allocated by malloc */ ptr->key[i] = NULL; } } - free(ptr); + xfree(ptr); /* allocated by ALLOC */ } } @@ -1340,7 +1340,7 @@ cbsubst_sym_to_subst(self, sym) ret = rb_str_new2(buf); - free(buf); + xfree(buf); return ret; } @@ -1408,7 +1408,7 @@ cbsubst_get_subst_arg(argc, argv, self) ret = rb_str_new2(buf); - free(buf); + xfree(buf); return ret; } @@ -1462,7 +1462,7 @@ cbsubst_get_subst_key(self, str) *ptr = '\0'; ret = rb_str_new2(buf); - free(buf); + xfree(buf); return ret; } @@ -1506,8 +1506,8 @@ cbsubst_get_all_subst_keys(self) ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2(buf)); - free(buf); - free(keys_buf); + xfree(buf); + xfree(keys_buf); return ret; } |