2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2176d01e1c..d758dbc96e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar  6 17:26:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): space flag is in effect for Inf/NaN too.
+	  [ruby-dev:34002]
+
 Thu Mar  6 15:44:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* sprintf.c (rb_str_format): casting double to long is undefined
diff --git a/sprintf.c b/sprintf.c
index 63ac093f29..1e3e76c4ad 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -794,6 +794,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 			    buf[blen + need - strlen(expr) - 1] = '-';
 			else if (flags & FPLUS)
 			    buf[blen + need - strlen(expr) - 1] = '+';
+			else if ((flags & FSPACE) && need > width)
+			    blen++;
 			strncpy(&buf[blen + need - strlen(expr)], expr,
 				strlen(expr));
 		    }