mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libcore: fix overflow/underflow in range_step

Browse Source
This commit is contained in:
gifnksm 2013-04-07 19:51:34 +09:00
parent 44d4d6de76
commit 89676d6a59
2 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libcore/num/int-template.rs
View File

@ -107,11 +107,15 @@ pub fn range_step(start: T, stop: T, step: T, it: &fn(T) -> bool) {
} else if step > 0 { // ascending
while i < stop {
if !it(i) { break }
// avoiding overflow. break if i + step > max_value
if i > max_value - step { break; }
i += step;
}
} else { // descending
while i > stop {
if !it(i) { break }
// avoiding underflow. break if i + step < min_value
if i < min_value - step { break; }
i += step;
}
}
@ -421,10 +425,26 @@ pub fn test_ranges() {
for range_step(36,30,-2) |i| {
l.push(i);
}
assert!(l == ~[0,1,2,
13,12,11,
20,22,24,
36,34,32]);
for range_step(max_value - 2, max_value, 2) |i| {
l.push(i);
}
for range_step(max_value - 3, max_value, 2) |i| {
l.push(i);
}
for range_step(min_value + 2, min_value, -2) |i| {
l.push(i);
}
for range_step(min_value + 3, min_value, -2) |i| {
l.push(i);
}
assert_eq!(l, ~[0,1,2,
13,12,11,
20,22,24,
36,34,32,
max_value-2,
max_value-3,max_value-1,
min_value+2,
min_value+3,min_value+1]);
// None of the `fail`s should execute.
for range(10,0) |_i| {

31
src/libcore/num/uint-template.rs
View File

@ -78,12 +78,15 @@ pub fn range_step(start: T,
if step >= 0 {
while i < stop {
if !it(i) { break }
// avoiding overflow. break if i + step > max_value
if i > max_value - (step as T) { break; }
i += step as T;
}
}
else {
} else {
while i > stop {
if !it(i) { break }
// avoiding underflow. break if i + step < min_value
if i < min_value + ((-step) as T) { break; }
i -= -step as T;
}
}
@ -371,11 +374,27 @@ pub fn test_ranges() {
for range_step(36,30,-2) |i| {
l.push(i);
}
for range_step(max_value - 2, max_value, 2) |i| {
l.push(i);
}
for range_step(max_value - 3, max_value, 2) |i| {
l.push(i);
}
for range_step(min_value + 2, min_value, -2) |i| {
l.push(i);
}
for range_step(min_value + 3, min_value, -2) |i| {
l.push(i);
}
assert!(l == ~[0,1,2,
13,12,11,
20,22,24,
36,34,32]);
assert_eq!(l, ~[0,1,2,
13,12,11,
20,22,24,
36,34,32,
max_value-2,
max_value-3,max_value-1,
min_value+2,
min_value+3,min_value+1]);
// None of the `fail`s should execute.
for range(0,0) |_i| {