1 files changed, 10 insertions, 4 deletions
diff --git a/numeric.c b/numeric.c
index bbe86a1708..aab049490d 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1755,10 +1755,16 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl)
 	double n = ruby_float_step_size(beg, end, unit, excl);
 	long i;
 
-	for (i=0; i<n; i++) {
-	    double d = i*unit+beg;
-	    if (unit >= 0 ? end < d : d < end) d = end;
-	    rb_yield(DBL2NUM(d));
+	if (isinf(unit)) {
+	    /* if unit is infinity, i*unit+beg is NaN */
+	    if (n) rb_yield(DBL2NUM(beg));
+	}
+	else {
+	    for (i=0; i<n; i++) {
+		double d = i*unit+beg;
+		if (unit >= 0 ? end < d : d < end) d = end;
+		rb_yield(DBL2NUM(d));
+	    }
 	}
 	return TRUE;
     }