Skip to content

Commit 412a070

Browse files
committed
auto merge of #5769 : gifnksm/rust/range_step, r=bstrie
`uint::range_step` or `int::range_step` causes overflow or underflow as following. code: ```rust fn main() { for uint::range_step(3, 0, -2) |n| { println(fmt!("%u", n)); } } ``` output: ``` 3 1 18446744073709551615 18446744073709551613 ... ``` This commit fixes this behavior as follows. ``` 3 1 ```
2 parents e56a178 + 89676d6 commit 412a070

File tree

2 files changed

+49
-10
lines changed

2 files changed

+49
-10
lines changed

src/libcore/num/int-template.rs

+24-4
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,15 @@ pub fn range_step(start: T, stop: T, step: T, it: &fn(T) -> bool) {
107107
} else if step > 0 { // ascending
108108
while i < stop {
109109
if !it(i) { break }
110+
// avoiding overflow. break if i + step > max_value
111+
if i > max_value - step { break; }
110112
i += step;
111113
}
112114
} else { // descending
113115
while i > stop {
114116
if !it(i) { break }
117+
// avoiding underflow. break if i + step < min_value
118+
if i < min_value - step { break; }
115119
i += step;
116120
}
117121
}
@@ -421,10 +425,26 @@ pub fn test_ranges() {
421425
for range_step(36,30,-2) |i| {
422426
l.push(i);
423427
}
424-
assert!(l == ~[0,1,2,
425-
13,12,11,
426-
20,22,24,
427-
36,34,32]);
428+
for range_step(max_value - 2, max_value, 2) |i| {
429+
l.push(i);
430+
}
431+
for range_step(max_value - 3, max_value, 2) |i| {
432+
l.push(i);
433+
}
434+
for range_step(min_value + 2, min_value, -2) |i| {
435+
l.push(i);
436+
}
437+
for range_step(min_value + 3, min_value, -2) |i| {
438+
l.push(i);
439+
}
440+
assert_eq!(l, ~[0,1,2,
441+
13,12,11,
442+
20,22,24,
443+
36,34,32,
444+
max_value-2,
445+
max_value-3,max_value-1,
446+
min_value+2,
447+
min_value+3,min_value+1]);
428448
429449
// None of the `fail`s should execute.
430450
for range(10,0) |_i| {

src/libcore/num/uint-template.rs

+25-6
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,15 @@ pub fn range_step(start: T,
7878
if step >= 0 {
7979
while i < stop {
8080
if !it(i) { break }
81+
// avoiding overflow. break if i + step > max_value
82+
if i > max_value - (step as T) { break; }
8183
i += step as T;
8284
}
83-
}
84-
else {
85+
} else {
8586
while i > stop {
8687
if !it(i) { break }
88+
// avoiding underflow. break if i + step < min_value
89+
if i < min_value + ((-step) as T) { break; }
8790
i -= -step as T;
8891
}
8992
}
@@ -371,11 +374,27 @@ pub fn test_ranges() {
371374
for range_step(36,30,-2) |i| {
372375
l.push(i);
373376
}
377+
for range_step(max_value - 2, max_value, 2) |i| {
378+
l.push(i);
379+
}
380+
for range_step(max_value - 3, max_value, 2) |i| {
381+
l.push(i);
382+
}
383+
for range_step(min_value + 2, min_value, -2) |i| {
384+
l.push(i);
385+
}
386+
for range_step(min_value + 3, min_value, -2) |i| {
387+
l.push(i);
388+
}
374389
375-
assert!(l == ~[0,1,2,
376-
13,12,11,
377-
20,22,24,
378-
36,34,32]);
390+
assert_eq!(l, ~[0,1,2,
391+
13,12,11,
392+
20,22,24,
393+
36,34,32,
394+
max_value-2,
395+
max_value-3,max_value-1,
396+
min_value+2,
397+
min_value+3,min_value+1]);
379398
380399
// None of the `fail`s should execute.
381400
for range(0,0) |_i| {

0 commit comments

Comments
 (0)