fix a bug in NSString#== where an exception would occur if the operan…

…d cannot be converted as a string git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/trunk@4035 23306eb0-4c56-4727-a40e-e92c0eb68959
ferrous26 · May 6, 2010 · 68eebf6 · 68eebf6
1 parent 6f24970
commit 68eebf6
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/NSString.m b/NSString.m
@@ -135,6 +135,15 @@
 static VALUE
 nsstr_equal(id rcv, SEL sel, VALUE other)
 {
+    if (rcv == (id)other) {
+        return Qtrue;
+    }
+    if (TYPE(other) != T_STRING) {
+        if (!rb_respond_to(other, rb_intern("to_str"))) {
+            return Qfalse;
+        }
+        return rb_equal(other, (VALUE)rcv);
+    }
     return [rcv isEqualToString:(id)to_str(other)] ? Qtrue : Qfalse;
 }