diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-29 08:00:47 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-29 08:00:47 +0000 |
| commit | d35b5a472695441175a9cb1dd64def2f750541d1 (patch) | |
| tree | 230f8ce7f04fdd5212f619acbeed7bd1724b362a /pack.c | |
| parent | b455b8391de63976ef824ce443000b82857e51ba (diff) | |
| download | ruby-d35b5a472695441175a9cb1dd64def2f750541d1.tar.gz | |
pack.c: unpack "M" may be ASCII only
* pack.c (pack_unpack_internal): set ASCII only properly on "M",
may be ASCII only. [ruby-core:83055] [Bug #13949]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'pack.c')
| -rw-r--r-- | pack.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1597,6 +1597,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) { VALUE buf = infected_str_new(0, send - s, str); char *ptr = RSTRING_PTR(buf), *ss = s; + int csum = 0; int c1, c2; while (s < send) { @@ -1608,18 +1609,19 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) if ((c1 = hex2num(*s)) == -1) break; if (++s == send) break; if ((c2 = hex2num(*s)) == -1) break; - *ptr++ = castchar(c1 << 4 | c2); + csum |= *ptr++ = castchar(c1 << 4 | c2); } } else { - *ptr++ = *s; + csum |= *ptr++ = *s; } s++; ss = s; } rb_str_set_len(buf, ptr - RSTRING_PTR(buf)); rb_str_buf_cat(buf, ss, send-ss); - ENCODING_CODERANGE_SET(buf, rb_ascii8bit_encindex(), ENC_CODERANGE_VALID); + csum = ISASCII(csum) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID; + ENCODING_CODERANGE_SET(buf, rb_ascii8bit_encindex(), csum); UNPACK_PUSH(buf); } break; |