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 | 4ed6e04490a689556f7f9a6c74f3256c00d5f67c (patch) | |
| tree | 481d1ab61cff6a18586aea97a871c69621c52968 /transcode.c | |
| parent | ca9b00b4cd5f0602bcfd9503c0a93b1eb9542cb9 (diff) | |
| download | ruby-4ed6e04490a689556f7f9a6c74f3256c00d5f67c.tar.gz ruby-4ed6e04490a689556f7f9a6c74f3256c00d5f67c.tar.xz ruby-4ed6e04490a689556f7f9a6c74f3256c00d5f67c.zip | |
* transcode.c (rb_econv_substr_append): fix for buffer overrun.
git-svn-id: http://svn.ruby-lang.org/repos/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 519c2f8c6..ddb185cc7 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; |