summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-17 14:28:34 (GMT)
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-17 14:28:34 (GMT)
commit108627d911260126ca144d2b4b74f3fda3acfabd (patch)
tree59148926ef3cf3f4f2f5e1f97d6e5b9d18cf8fef
parent50650bb338744994c3c927f73fa6cb071e6f676a (diff)
* 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
-rw-r--r--ChangeLog5
-rw-r--r--pack.c32
-rw-r--r--test/ruby/test_pack.rb5
3 files changed, 26 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 642dce5..506fb18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 17 22:47:11 2014 Tanaka Akira <akr@fsij.org>
+
+ * 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 <akr@fsij.org>
* pack.c (pack_unpack): Add casts for char references for 'b' and 'h'.
diff --git a/pack.c b/pack.c
index 0cf2dc3..937cbe2 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 64d1e68..86b34b3 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