Skip to content

Commit

Permalink
* file.c (SET_EXTERNAL_ENCODING): avoid call rb_enc_check() on
Browse files Browse the repository at this point in the history
  half-baked result string.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
matz committed Apr 14, 2008
1 parent ac5b69a commit 755a86b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Mon Apr 14 22:44:24 2008 Yukihiro Matsumoto <[email protected]>

* file.c (SET_EXTERNAL_ENCODING): avoid call rb_enc_check() on
half-baked result string.

Mon Apr 14 17:23:27 2008 Akinori MUSHA <[email protected]>

* hash.c (rb_hash_delete_if, rb_hash_reject_bang, env_delete_if,
Expand Down
3 changes: 1 addition & 2 deletions file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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*);

Expand Down

0 comments on commit 755a86b

Please sign in to comment.