From 4baea7dd8ee879dfff74df824c7e5963ff954625 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Dec 2007 06:16:02 +0000
Subject: * encoding.c (rb_to_encoding_index): should return error instead of  
 exception even if type is incorrect.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 encoding.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'encoding.c')

diff --git a/encoding.c b/encoding.c
index ba83837f49..819ac54071 100644
--- a/encoding.c
+++ b/encoding.c
@@ -81,6 +81,9 @@ rb_to_encoding_index(VALUE enc)
     if (idx >= 0) {
 	return idx;
     }
+    else if (NIL_P(enc = rb_check_string_type(enc))) {
+	return -1;
+    }
     else {
 	return rb_enc_find_index(StringValueCStr(enc));
     }
-- 
cgit v1.2.3