diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | transcode.c | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -1,7 +1,9 @@ -Mon Aug 25 17:34:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Aug 25 17:35:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * transcode.c (rb_econv_substr_append): fix for buffer overrun. + * win32/enc-setup.mak (BUILTIN_TRANSOBJS): added. + Mon Aug 25 14:22:21 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> * parse.y (YYSTYPE): struct RVarmap has been no longer diff --git a/transcode.c b/transcode.c index 519c2f8c61..ddb185cc77 100644 --- a/transcode.c +++ b/transcode.c @@ -1360,8 +1360,9 @@ rb_econv_substr_append(rb_econv_t *ec, VALUE src, long off, long len, VALUE dst, } ss = sp = (const unsigned char *)RSTRING_PTR(src) + off; se = ss + len; - ds = dp = (unsigned char *)RSTRING_PTR(dst) + dlen; + ds = (unsigned char *)RSTRING_PTR(dst); de = ds + rb_str_capacity(dst); + dp = ds += dlen; res = rb_econv_convert(ec, &sp, se, &dp, de, flags); off += sp - ss; len -= sp - ss; |