diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-13 02:00:30 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-13 02:00:30 +0000 |
commit | 87335c3e2f04f946b768a46e677f576863665cbb (patch) | |
tree | d71f869776134612d8618871000b41ab43e7a246 | |
parent | 207becd9422e53e15fcbbb5a0ab92aae2b87121d (diff) |
* sprintf.c (rb_str_format): check encoding compatibility only on
real parts.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sprintf.c | 2 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +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 12 19:54:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * dir.c (bracket, fnmatch_helper): compare bytewise first, to get @@ -660,7 +660,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); - enc = rb_enc_check(result, str); + enc = rb_enc_check(rb_str_substr(result, 0, blen), str); if (flags&(FPREC|FWIDTH)) { slen = rb_enc_strlen(RSTRING_PTR(str),RSTRING_END(str),enc); if (slen < 0) { @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-04-12" +#define RUBY_RELEASE_DATE "2009-04-13" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |