summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-02 17:40:10 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-02 17:40:10 +0000
commitc99a895e28c8dcf8c359720ea0d1b8c9887bedf4 (patch)
treed161aef517690dbe030bac1b889a405c177bde4f
parent7911d42f1b3b4d6fdaab7a70d69c7bb1351af06c (diff)
* encoding.c (enc_alias_internal): use xfree instead of free.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--encoding.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bdca90c727..7268671b42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec 3 01:52:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * encoding.c (enc_alias_internal): use xfree instead of free.
+
Thu Dec 2 23:52:26 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* NEWS: entry for ruby_vm_at_exit().
diff --git a/encoding.c b/encoding.c
index db0f5c8ae6..70cc65ba3b 100644
--- a/encoding.c
+++ b/encoding.c
@@ -445,7 +445,7 @@ enc_alias_internal(const char *alias, int idx)
{
char *name = strdup(alias);
if (st_insert(enc_table.names, (st_data_t)name, (st_data_t)idx)) {
- free(name);
+ xfree(name);
return NULL;
}
return name;