1 files changed, 6 insertions, 0 deletions
diff --git a/numeric.c b/numeric.c
index 6f59c98a47..a3cb3be1c8 100644
--- a/numeric.c
+++ b/numeric.c
@@ -926,6 +926,7 @@ flo_cmp(VALUE x, VALUE y)
     double a, b;
 
     a = RFLOAT_VALUE(x);
+    if (isnan(a)) return Qnil;
     switch (TYPE(y)) {
       case T_FIXNUM:
 	b = (double)FIX2LONG(y);
@@ -944,6 +945,11 @@ flo_cmp(VALUE x, VALUE y)
 	break;
 
       default:
+	if (isinf(a) && (!rb_respond_to(y, rb_intern("infinite?")) ||
+			 !RTEST(rb_funcall(y, rb_intern("infinite?"), 0, 0)))) {
+	    if (a > 0.0) return INT2FIX(1);
+	    return INT2FIX(-1);
+	}
 	return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
     }
     return rb_dbl_cmp(a, b);