Skip to content

Commit ecf6599

Browse files
committed
xargo version check: also check application name, just to be sure
1 parent 133e012 commit ecf6599

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/bin/cargo-miri.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,14 @@ fn xargo_version() -> Option<(u32, u32, u32)> {
123123
let line = out.stderr.lines().nth(0)
124124
.expect("malformed `xargo --version` output: not at least one line")
125125
.expect("malformed `xargo --version` output: error reading first line");
126-
let version = line.split(' ').nth(1)
127-
.expect("malformed `xargo --version` output: not at least two words");
126+
let (name, version) = {
127+
let mut split = line.split(' ');
128+
(split.next().expect("malformed `xargo --version` output: empty"),
129+
split.next().expect("malformed `xargo --version` output: not at least two words"))
130+
};
131+
if name != "xargo" {
132+
panic!("malformed `xargo --version` output: application name is not `xargo`");
133+
}
128134
let mut version_pieces = version.split('.');
129135
let major = version_pieces.next()
130136
.expect("malformed `xargo --version` output: not a major version piece")

0 commit comments

Comments
 (0)