diff --git a/ChangeLog b/ChangeLog
index e4016a2e51..a99636f4d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 30 00:41:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_justify): [ruby-dev:25367]
+
 Wed Dec 29 11:07:07 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/template/html/kilmer.rb: Update to use new
@@ -47,6 +51,10 @@ Mon Dec 27 16:55:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): should use
 	  rb_hash_new to get exactly a Hash. fix [ruby-dev:25325].
 
+Mon Dec 27 16:29:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_justify): [ruby-dev:25341]
+
 Mon Dec 27 15:47:48 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* test/fileutils/fileasserts.rb: sync with HEAD.
diff --git a/string.c b/string.c
index d1bd90c8df..c0bd42d464 100644
--- a/string.c
+++ b/string.c
@@ -4474,7 +4474,6 @@ rb_str_justify(argc, argv, str, jflag)
 
     rb_scan_args(argc, argv, "11", &w, &pad);
     width = NUM2LONG(w);
-    if (width < 0 || RSTRING(str)->len >= width) return rb_str_dup(str);
     if (argc == 2) {
 	StringValue(pad);
 	f = RSTRING(pad)->ptr;
@@ -4483,6 +4482,7 @@ rb_str_justify(argc, argv, str, jflag)
 	    rb_raise(rb_eArgError, "zero width padding");
 	}
     }
+    if (width < 0 || RSTRING(str)->len >= width) return rb_str_dup(str);
     res = rb_str_new5(str, 0, width);
     p = RSTRING(res)->ptr;
     if (jflag != 'l') {