merges r23186 and r23187 from trunk into ruby_1_9_1.

--
* sprintf.c (rb_str_format): check encoding compatibility only on
  real parts.
--
* sprintf.c (rb_str_format): optimize previous commit.
  [ruby-list:45954]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f0583b26d..3649c19ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Apr 13 11:35:55 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): optimize previous commit.
+	  [ruby-list:45954]
+
+Mon Apr 13 10:58:54 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): check encoding compatibility only on
+	  real parts.
+
 Sun Apr 19 13:17:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* gem_prelude.rb (Gem::QuickLoader#push_gem_version_on_load_path):
diff --git a/sprintf.c b/sprintf.c
index aebb9d5e6..f4143a98c 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -652,6 +652,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 		str = rb_obj_as_string(arg);
 		if (OBJ_TAINTED(str)) tainted = 1;
 		len = RSTRING_LEN(str);
+		rb_str_set_len(result, blen);
 		enc = rb_enc_check(result, str);
 		if (flags&(FPREC|FWIDTH)) {
 		    slen = rb_enc_strlen(RSTRING_PTR(str),RSTRING_END(str),enc);