mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* Avoid undefined behaviors found by gcc -fsanitize=undefined.
gcc (Debian 4.9.1-16) 4.9.1 * string.c (rb_str_sum): Avoid undefined behavior. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1efb3c31b7
commit
0d4185f30e
3 changed files with 13 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
|||
Fri Oct 17 17:50:10 2014 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* Avoid undefined behaviors found by gcc -fsanitize=undefined.
|
||||
gcc (Debian 4.9.1-16) 4.9.1
|
||||
|
||||
* string.c (rb_str_sum): Avoid undefined behavior.
|
||||
|
||||
Fri Oct 17 17:43:50 2014 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* Avoid undefined behaviors found by gcc -fsanitize=undefined.
|
||||
|
|
4
string.c
4
string.c
|
@ -7571,7 +7571,7 @@ rb_str_ord(VALUE s)
|
|||
*
|
||||
* Returns a basic <em>n</em>-bit checksum of the characters in <i>str</i>,
|
||||
* where <em>n</em> is the optional <code>Fixnum</code> parameter, defaulting
|
||||
* to 16. The result is simply the sum of the binary value of each character in
|
||||
* to 16. The result is simply the sum of the binary value of each byte in
|
||||
* <i>str</i> modulo <code>2**n - 1</code>. This is not a particularly good
|
||||
* checksum.
|
||||
*/
|
||||
|
@ -7592,6 +7592,8 @@ rb_str_sum(int argc, VALUE *argv, VALUE str)
|
|||
else {
|
||||
rb_scan_args(argc, argv, "01", &vbits);
|
||||
bits = NUM2INT(vbits);
|
||||
if (bits < 0)
|
||||
bits = 0;
|
||||
}
|
||||
ptr = p = RSTRING_PTR(str);
|
||||
len = RSTRING_LEN(str);
|
||||
|
|
|
@ -1584,6 +1584,8 @@ class TestString < Test::Unit::TestCase
|
|||
assert_equal(16, n.sum(17))
|
||||
n[0] = 2.chr
|
||||
assert_not_equal(15, n.sum)
|
||||
assert_equal(17, n.sum(0))
|
||||
assert_equal(17, n.sum(-1))
|
||||
end
|
||||
|
||||
def check_sum(str, bits=16)
|
||||
|
@ -1598,7 +1600,7 @@ class TestString < Test::Unit::TestCase
|
|||
assert_equal(294, "abc".sum)
|
||||
check_sum("abc")
|
||||
check_sum("\x80")
|
||||
0.upto(70) {|bits|
|
||||
-3.upto(70) {|bits|
|
||||
check_sum("xyz", bits)
|
||||
}
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue