diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-17 08:50:01 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-17 08:50:01 +0000 |
commit | 1efb3c31b731e99627bbc0da13dfd3463bb67c67 (patch) | |
tree | f6258144a4e2509c34fac5fcda8291547951b4dc /pack.c | |
parent | 0f67a3bb3171c98770c7a5de8559636d2551a3b8 (diff) |
* Avoid undefined behaviors found by gcc -fsanitize=undefined.
gcc (Debian 4.9.1-16) 4.9.1
* include/ruby/ruby.h (INT2FIX): Avoid undefined behavior.
* node.h (nd_set_line): Ditto.
* pack.c (encodes): Ditto.
(pack_unpack): Ditto.
* regint.h (BIT_STATUS_AT): Ditto.
(BS_BIT): Ditto.
* time.c (time_mdump): Ditto.
(time_mload): Ditto.
* vm_core.h (VM_FRAME_MAGIC_MASK): Ditto.
* vm_trace.c (recalc_add_ruby_vm_event_flags): Ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'pack.c')
-rw-r--r-- | pack.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -943,13 +943,14 @@ static const char b64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; static void -encodes(VALUE str, const char *s, long len, int type, int tail_lf) +encodes(VALUE str, const char *s0, long len, int type, int tail_lf) { enum {buff_size = 4096, encoded_unit = 4, input_unit = 3}; char buff[buff_size + 1]; /* +1 for tail_lf */ long i = 0; const char *const trans = type == 'u' ? uu_table : b64_table; char padding; + const unsigned char *s = (const unsigned char *)s0; if (type == 'u') { buff[i++] = (char)len + ' '; @@ -1362,7 +1363,7 @@ pack_unpack(VALUE str, VALUE fmt) t = RSTRING_PTR(bitstr); for (i=0; i<len; i++) { if (i & 7) bits <<= 1; - else bits = *s++; + else bits = (unsigned char)*s++; *t++ = (bits & 128) ? '1' : '0'; } } @@ -1406,7 +1407,7 @@ pack_unpack(VALUE str, VALUE fmt) if (i & 1) bits <<= 4; else - bits = *s++; + bits = (unsigned char)*s++; *t++ = hexdigits[(bits >> 4) & 15]; } } |