1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* pack.c (pack_unpack): reduced static variables.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-07-30 15:58:36 +00:00
parent c5e1d8c3d5
commit e7207d0404
2 changed files with 15 additions and 13 deletions

View file

@ -1,3 +1,7 @@
Thu Jul 31 00:58:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (pack_unpack): reduced static variables.
Thu Jul 31 00:10:20 2008 Yusuke Endoh <mame@tsg.ne.jp>
* proc.c (rb_proc_call_with_block): prevent null reference.

16
pack.c
View file

@ -1787,32 +1787,30 @@ pack_unpack(VALUE str, VALUE fmt)
VALUE buf = infected_str_new(0, (send - s)*3/4, str);
char *ptr = RSTRING_PTR(buf);
int a = -1,b = -1,c = 0,d;
static int first = 1;
static int b64_xtable[256];
static signed char b64_xtable[256];
if (first) {
if (b64_xtable['/'] <= 0) {
int i;
first = 0;
for (i = 0; i < 256; i++) {
b64_xtable[i] = -1;
}
for (i = 0; i < 64; i++) {
b64_xtable[(int)b64_table[i]] = i;
b64_xtable[(unsigned char)b64_table[i]] = i;
}
}
while (s < send) {
a = b = c = d = -1;
while((a = b64_xtable[(int)(*(unsigned char*)s)]) == -1 && s < send) { s++; }
while ((a = b64_xtable[(unsigned char)*s]) == -1 && s < send) {s++;}
if (s >= send) break;
s++;
while((b = b64_xtable[(int)(*(unsigned char*)s)]) == -1 && s < send) { s++; }
while ((b = b64_xtable[(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++; }
while ((c = b64_xtable[(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++; }
while ((d = b64_xtable[(unsigned char)*s]) == -1 && s < send) {if (*s == '=') break; s++;}
if (*s == '=' || s >= send) break;
s++;
*ptr++ = a << 2 | b >> 4;