Skip to content

Commit 9b6a1f2

Browse files
committed
---
yaml --- r: 149390 b: refs/heads/try2 c: 25ba057 h: refs/heads/master v: v3
1 parent c9d7823 commit 9b6a1f2

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 53b9d1a3248143aafe421566ba31742579da9722
8+
refs/heads/try2: 25ba057fad54da946bb3d72925c9a93b0abe61ac
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libnum/bigint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,7 @@ impl FromStrRadix for BigInt {
12541254
}
12551255
}
12561256
1257-
trait RandBigInt {
1257+
pub trait RandBigInt {
12581258
/// Generate a random `BigUint` of the given bit size.
12591259
fn gen_biguint(&mut self, bit_size: uint) -> BigUint;
12601260

branches/try2/src/libstd/os.rs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,15 @@ pub mod win32 {
113113
let mut done = false;
114114
while !done {
115115
let mut buf = vec::from_elem(n as uint, 0u16);
116-
let k = f(buf.as_mut_ptr(), TMPBUF_SZ as DWORD);
116+
let k = f(buf.as_mut_ptr(), n);
117117
if k == (0 as DWORD) {
118118
done = true;
119119
} else if k == n &&
120120
libc::GetLastError() ==
121121
libc::ERROR_INSUFFICIENT_BUFFER as DWORD {
122122
n *= (2 as DWORD);
123+
} else if k >= n {
124+
n = k;
123125
} else {
124126
done = true;
125127
}
@@ -1494,6 +1496,16 @@ mod tests {
14941496
}
14951497
}
14961498
1499+
#[test]
1500+
fn test_env_set_get_huge() {
1501+
let n = make_rand_name();
1502+
let s = "x".repeat(10000);
1503+
setenv(n, s);
1504+
assert_eq!(getenv(n), Some(s));
1505+
unsetenv(n);
1506+
assert_eq!(getenv(n), None);
1507+
}
1508+
14971509
#[test]
14981510
fn test_env_setenv() {
14991511
let n = make_rand_name();

0 commit comments

Comments
 (0)