Skip to content

Commit 9ec723e

Browse files
committed
---
yaml --- r: 79858 b: refs/heads/master c: fe03d82 h: refs/heads/master v: v3
1 parent 5a98009 commit 9ec723e

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 21ce41d42d6b86e482ec2e7fe01b3feb74dd4ea4
2+
refs/heads/master: fe03d827a4910c561507be0802bb5f39a477cc02
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 54ae2800ffb30513f89ce13d27ac3c8d095d98ac
55
refs/heads/try: 71bebebc37fbb229877da88dde13c2f35913bd77

trunk/src/libextra/rl.rs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,17 @@ pub fn read(prompt: &str) -> Option<~str> {
9191
let line = locked!(rustrt::linenoise(buf));
9292

9393
if line.is_null() { None }
94-
else { Some(str::raw::from_c_str(line)) }
94+
else {
95+
unsafe {
96+
do (|| {
97+
Some(str::raw::from_c_str(line))
98+
}).finally {
99+
// linenoise's return value is from strdup, so we
100+
// better not leak it.
101+
rt::global_heap::exchange_free(line);
102+
}
103+
}
104+
}
95105
}
96106
}
97107

0 commit comments

Comments
 (0)