forked from extern/nushell
Fix capacity overflow caused by large range of ports (#11210)
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> Try to fix capacity overflow caused by large range of ports. ``` $ port 1024 999999999999999999 12/02/23 20:03:14 PM thread 'main' panicked at 'capacity overflow', library/alloc/src/raw_vec.rs:524:5 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace ``` # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
This commit is contained in:
parent
f36c055c50
commit
7d8df4ba9e
@ -101,15 +101,17 @@ fn get_free_port(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// try given port one by one.
|
// try given port one by one.
|
||||||
let addrs: Vec<SocketAddr> = (start_port..=end_port)
|
match (start_port..=end_port)
|
||||||
.map(|current| {
|
.map(|port| SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::LOCALHOST, port as u16)))
|
||||||
SocketAddr::V4(SocketAddrV4::new(
|
.find_map(|addr| TcpListener::bind(addr).ok())
|
||||||
Ipv4Addr::new(127, 0, 0, 1),
|
{
|
||||||
current as u16,
|
Some(listener) => listener,
|
||||||
))
|
None => {
|
||||||
})
|
return Err(ShellError::IOError {
|
||||||
.collect();
|
msg: "Every port has been tried, but no valid one was found".to_string(),
|
||||||
TcpListener::bind(addrs.as_slice())?
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let free_port = listener.local_addr()?.port();
|
let free_port = listener.local_addr()?.port();
|
||||||
|
@ -30,7 +30,10 @@ fn port_with_already_usage() {
|
|||||||
handler.join().unwrap();
|
handler.join().unwrap();
|
||||||
|
|
||||||
// check for error kind str.
|
// check for error kind str.
|
||||||
if actual.err.contains("AddrInUse") {
|
if actual
|
||||||
|
.err
|
||||||
|
.contains("Every port has been tried, but no valid one was found")
|
||||||
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user