From 108627d911260126ca144d2b4b74f3fda3acfabd Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 17 Oct 2014 14:28:34 +0000 Subject: * pack.c (pack_unpack): Add casts for char references for 'u'. Fix line ending recognition algorithm. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ pack.c | 32 ++++++++++++++++---------------- test/ruby/test_pack.rb | 5 +++++ 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 642dce5bda..506fb183a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 17 22:47:11 2014 Tanaka Akira + + * pack.c (pack_unpack): Add casts for char references for 'u'. + Fix line ending recognition algorithm. + Fri Oct 17 21:49:52 2014 Tanaka Akira * pack.c (pack_unpack): Add casts for char references for 'b' and 'h'. diff --git a/pack.c b/pack.c index 0cf2dc37b7..937cbe28c1 100644 --- a/pack.c +++ b/pack.c @@ -1612,12 +1612,12 @@ pack_unpack(VALUE str, VALUE fmt) char *ptr = RSTRING_PTR(buf); long total = 0; - while (s < send && *s > ' ' && *s < 'a') { + while (s < send && (unsigned char)*s > ' ' && (unsigned char)*s < 'a') { long a,b,c,d; - char hunk[4]; + char hunk[3]; + + len = ((unsigned char)*s++ - ' ') & 077; - hunk[3] = '\0'; - len = (*s++ - ' ') & 077; total += len; if (total > RSTRING_LEN(buf)) { len -= total - RSTRING_LEN(buf); @@ -1627,20 +1627,20 @@ pack_unpack(VALUE str, VALUE fmt) while (len > 0) { long mlen = len > 3 ? 3 : len; - if (s < send && *s >= ' ') - a = (*s++ - ' ') & 077; + if (s < send && (unsigned char)*s >= ' ' && (unsigned char)*s < 'a') + a = ((unsigned char)*s++ - ' ') & 077; else a = 0; - if (s < send && *s >= ' ') - b = (*s++ - ' ') & 077; + if (s < send && (unsigned char)*s >= ' ' && (unsigned char)*s < 'a') + b = ((unsigned char)*s++ - ' ') & 077; else b = 0; - if (s < send && *s >= ' ') - c = (*s++ - ' ') & 077; + if (s < send && (unsigned char)*s >= ' ' && (unsigned char)*s < 'a') + c = ((unsigned char)*s++ - ' ') & 077; else c = 0; - if (s < send && *s >= ' ') - d = (*s++ - ' ') & 077; + if (s < send && (unsigned char)*s >= ' ' && (unsigned char)*s < 'a') + d = ((unsigned char)*s++ - ' ') & 077; else d = 0; hunk[0] = (char)(a << 2 | b >> 4); @@ -1650,10 +1650,10 @@ pack_unpack(VALUE str, VALUE fmt) ptr += mlen; len -= mlen; } - if (*s == '\r') s++; - if (*s == '\n') s++; - else if (s < send && (s+1 == send || s[1] == '\n')) - s += 2; /* possible checksum byte */ + if (s < send && (unsigned char)*s != '\r' && *s != '\n') + s++; /* possible checksum byte */ + if (s < send && *s == '\r') s++; + if (s < send && *s == '\n') s++; } rb_str_set_len(buf, total); diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index 64d1e68245..86b34b3ba6 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -526,6 +526,11 @@ EXPECTED assert_equal(["a"*46], "M86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A\n!80``\n".unpack("u")) assert_equal(["abcdefghi"], "&86)C9&5F\n#9VAI\n".unpack("u")) + assert_equal(["abcdef"], "#86)C\n#9&5F\n".unpack("u")) + assert_equal(["abcdef"], "#86)CX\n#9&5FX\n".unpack("u")) # X is a (dummy) checksum. + assert_equal(["abcdef"], "#86)C\r\n#9&5F\r\n".unpack("u")) + assert_equal(["abcdef"], "#86)CX\r\n#9&5FX\r\n".unpack("u")) # X is a (dummy) checksum. + assert_equal(["\x00"], "\"\n".unpack("u")) assert_equal(["\x00"], "! \r \n".unpack("u")) end -- cgit v1.2.3