diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-14 13:45:26 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-14 13:45:26 +0000 |
commit | 755a86b87a38fa55d3380e657f19eca63dfee0e0 (patch) | |
tree | 1e25fedd3279041fad85e9b2c01eb8c0ae3a607c | |
parent | ac5b69acb8ccc578ea780701da4efb26f278ca48 (diff) | |
download | ruby-755a86b87a38fa55d3380e657f19eca63dfee0e0.tar.gz |
* file.c (SET_EXTERNAL_ENCODING): avoid call rb_enc_check() on
half-baked result string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Apr 14 22:44:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * file.c (SET_EXTERNAL_ENCODING): avoid call rb_enc_check() on + half-baked result string. + Mon Apr 14 17:23:27 2008 Akinori MUSHA <knu@iDaemons.org> * hash.c (rb_hash_delete_if, rb_hash_reject_bang, env_delete_if, @@ -2553,8 +2553,7 @@ rb_path_end(const char *path) #define SET_EXTERNAL_ENCODING() (\ (void)(extenc || (extenc = rb_default_external_encoding())),\ - rb_enc_associate(result, extenc),\ - rb_enc_check(fname, result)) + rb_enc_associate(result, extenc)) static int is_absolute_path(const char*); |