diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | encoding.c | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Jan 11 06:13:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (rb_to_encoding_index, rb_to_encoding): disallow nil. + [ruby-dev:33003] + Fri Jan 11 01:08:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * thread.c (rb_mutex_unlock): proper error message for unlocking diff --git a/encoding.c b/encoding.c index 422744478e..ec8303cfeb 100644 --- a/encoding.c +++ b/encoding.c @@ -78,7 +78,6 @@ rb_to_encoding_index(VALUE enc) { int idx; - if (NIL_P(enc)) return 0; idx = enc_check_encoding(enc); if (idx >= 0) { return idx; @@ -96,7 +95,6 @@ rb_to_encoding(VALUE enc) { int idx; - if (NIL_P(enc)) return 0; idx = enc_check_encoding(enc); if (idx >= 0) return RDATA(enc)->data; if ((idx = rb_enc_find_index(StringValueCStr(enc))) < 0) { |