diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-25 08:35:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-25 08:35:42 +0000 |
| commit | 10906176b4dea0444588fba36b98f4b144a25775 (patch) | |
| tree | 481d1ab61cff6a18586aea97a871c69621c52968 /transcode.c | |
| parent | 0d0c147f23ef526437a7904c8ce22d60fa232c95 (diff) | |
| download | ruby-10906176b4dea0444588fba36b98f4b144a25775.tar.gz | |
* transcode.c (rb_econv_substr_append): fix for buffer overrun.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |