From b7df3e9f4eb31886354b4fdb1622c7b839ae7db1 Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 11 Mar 2012 14:59:42 +0000 Subject: * pack.c (pack_unpack): when unpack('M') occurs an illegal byte sequence, output the "=" character and the following character in the decoded data without any transformation. [ruby-dev:44875] [Bug #5635] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- pack.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pack.c') diff --git a/pack.c b/pack.c index a75c02bac6..78789889de 100644 --- a/pack.c +++ b/pack.c @@ -1991,7 +1991,7 @@ pack_unpack(VALUE str, VALUE fmt) case 'M': { VALUE buf = infected_str_new(0, send - s, str); - char *ptr = RSTRING_PTR(buf); + char *ptr = RSTRING_PTR(buf), *ss = s; int c1, c2; while (s < send) { @@ -2010,8 +2010,10 @@ pack_unpack(VALUE str, VALUE fmt) *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); UNPACK_PUSH(buf); } -- cgit v1.2.3