summaryrefslogtreecommitdiff
path: root/pack.c
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 /pack.c
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
Diffstat (limited to 'pack.c')
-rw-r--r--pack.c32
1 files changed, 16 insertions, 16 deletions
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);