diff options
| author | Nobuyoshi Nakada <[email protected]> | 2022-08-18 11:37:54 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2022-08-18 14:57:08 +0900 |
| commit | 725626d8905fe1ac4a2cf1c3e2db6412bf8f381f () | |
| tree | 7cae7468c03688405b2a6fa6cfe5af21fb599f7e | |
| parent | 2a55c61ee77df55e8715809958ea0439f3918cf2 (diff) | |
[Bug #18964] Update the code range of appended portion
Notes: Merged: https://.com/ruby/ruby/pull/6250
| -rw-r--r-- | ext/-test-/econv/append.c | 15 | ||||
| -rw-r--r-- | ext/-test-/econv/extconf.rb | 3 | ||||
| -rw-r--r-- | ext/-test-/econv/init.c | 11 | ||||
| -rw-r--r-- | transcode.c | 34 |
4 files changed, 59 insertions, 4 deletions
@@ -0,0 +1,15 @@ @@ -0,0 +1,3 @@ @@ -0,0 +1,11 @@ @@ -1812,6 +1812,12 @@ rb_econv_asciicompat_encoding(const char *ascii_incompat_name) return data.ascii_compat_name; } VALUE rb_econv_append(rb_econv_t *ec, const char *ss, long len, VALUE dst, int flags) { @@ -1819,11 +1825,19 @@ rb_econv_append(rb_econv_t *ec, const char *ss, long len, VALUE dst, int flags) unsigned char *ds, *dp, *de; rb_econv_result_t res; int max_output; if (NIL_P(dst)) { dst = rb_str_buf_new(len); - if (ec->destination_encoding) - rb_enc_associate(dst, ec->destination_encoding); } if (ec->last_tc) @@ -1832,13 +1846,13 @@ rb_econv_append(rb_econv_t *ec, const char *ss, long len, VALUE dst, int flags) max_output = 1; do { long dlen = RSTRING_LEN(dst); if (rb_str_capacity(dst) - dlen < (size_t)len + max_output) { unsigned long new_capa = (unsigned long)dlen + len + max_output; if (LONG_MAX < new_capa) rb_raise(rb_eArgError, "too long string"); - rb_str_resize(dst, new_capa); - rb_str_set_len(dst, dlen); } sp = (const unsigned char *)ss; se = sp + len; @@ -1846,6 +1860,18 @@ rb_econv_append(rb_econv_t *ec, const char *ss, long len, VALUE dst, int flags) de = ds + rb_str_capacity(dst); dp = ds += dlen; res = rb_econv_convert(ec, &sp, se, &dp, de, flags); len -= (const char *)sp - ss; ss = (const char *)sp; rb_str_set_len(dst, dlen + (dp - ds)); |