summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-28 12:05:21 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-28 12:05:21 +0000
commita53832da71fc48437e83434478ee08554663ff14 (patch)
treee5e2cc453517f5351bac59b085fc503340bc39cd
parent0cf5edb9f754ccbb63c7a5d8022a6cfff1e7fa1b (diff)
* merge -c 11935
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@11938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--pack.c23
2 files changed, 21 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c38c0d..b2b5c17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 28 20:51:32 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * pack.c (pack_unpack): properly ignore non-base64 octets such as
+ UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
+ to fix [ruby-core:10437]
+
Tue Feb 27 21:50:10 2007 WATANABE Hirofumi <eban@ruby-lang.org>
* util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
diff --git a/pack.c b/pack.c
index 4ee3a90..e5324d1 100644
--- a/pack.c
+++ b/pack.c
@@ -1804,20 +1804,27 @@ pack_unpack(str, fmt)
}
}
while (s < send) {
- while (s[0] == '\r' || s[0] == '\n') { s++; }
- if ((a = b64_xtable[(int)s[0]]) == -1) break;
- if ((b = b64_xtable[(int)s[1]]) == -1) break;
- if ((c = b64_xtable[(int)s[2]]) == -1) break;
- if ((d = b64_xtable[(int)s[3]]) == -1) break;
+ a = b = c = d = -1;
+ while((a = b64_xtable[(int)(*(unsigned char*)s)]) == -1 && s < send) { s++; }
+ if( s >= send ) break;
+ s++;
+ while((b = b64_xtable[(int)(*(unsigned char*)s)]) == -1 && s < send) { s++; }
+ if( s >= send ) break;
+ s++;
+ while((c = b64_xtable[(int)(*(unsigned char*)s)]) == -1 && s < send) { if( *s == '=' ) break; s++; }
+ if( *s == '=' || s >= send ) break;
+ s++;
+ while((d = b64_xtable[(int)(*(unsigned char*)s)]) == -1 && s < send) { if( *s == '=' ) break; s++; }
+ if( *s == '=' || s >= send ) break;
+ s++;
*ptr++ = a << 2 | b >> 4;
*ptr++ = b << 4 | c >> 2;
*ptr++ = c << 6 | d;
- s += 4;
}
if (a != -1 && b != -1) {
- if (s + 2 < send && s[2] == '=')
+ if (c == -1 && *s == '=')
*ptr++ = a << 2 | b >> 4;
- if (c != -1 && s + 3 < send && s[3] == '=') {
+ else if (c != -1 && *s == '=') {
*ptr++ = a << 2 | b >> 4;
*ptr++ = b << 4 | c >> 2;
}