From 4e2989ee8f53d421e9fef21df67420629285b357 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 31 Jan 2018 13:28:39 +0000 Subject: merge revision(s) 60059: [Backport #13949] 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/branches/ruby_2_3@62138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- pack.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pack.c') diff --git a/pack.c b/pack.c index d19f9d1dd2..e27eeef6cc 100644 --- a/pack.c +++ b/pack.c @@ -1706,6 +1706,7 @@ pack_unpack(VALUE str, VALUE fmt) { 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) { @@ -1717,18 +1718,19 @@ pack_unpack(VALUE str, VALUE fmt) 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; -- cgit v1.2.3