Ecosystem/gupaxx
1
0
Fork 0
mirror of https://github.com/Cyrix126/gupaxx.git synced 2025-01-09 15:39:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

main: fix potential index panic

Browse source
This commit is contained in:
hinto.janai 2023-04-14 12:30:19 -04:00
parent a4eba8a77f
commit 29ca04c4f1
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/disk.rs
View file

@ -349,6 +349,10 @@ impl Node {
vec![("Local Monero Node".to_string(), Self::localhost())] vec![("Local Monero Node".to_string(), Self::localhost())]
} }
pub fn new_tuple() -> (String, Self) {
("Local Monero Node".to_string(), Self::localhost())
}
// Convert [String] to [Node] Vec // Convert [String] to [Node] Vec
pub fn from_str_to_vec(string: &str) -> Result<Vec<(String, Self)>, TomlError> { pub fn from_str_to_vec(string: &str) -> Result<Vec<(String, Self)>, TomlError> {
let nodes: toml::map::Map<String, toml::Value> = match toml::de::from_str(string) { let nodes: toml::map::Map<String, toml::Value> = match toml::de::from_str(string) {
@ -483,6 +487,10 @@ impl Pool {
vec![("Local P2Pool".to_string(), Self::p2pool())] vec![("Local P2Pool".to_string(), Self::p2pool())]
} }
pub fn new_tuple() -> (String, Self) {
("Local P2Pool".to_string(), Self::p2pool())
}
pub fn from_str_to_vec(string: &str) -> Result<Vec<(String, Self)>, TomlError> { pub fn from_str_to_vec(string: &str) -> Result<Vec<(String, Self)>, TomlError> {
let pools: toml::map::Map<String, toml::Value> = match toml::de::from_str(string) { let pools: toml::map::Map<String, toml::Value> = match toml::de::from_str(string) {
Ok(map) => { Ok(map) => {

12
src/main.rs
View file

@ -421,8 +421,11 @@ impl App {
// Handle [node_vec] overflow // Handle [node_vec] overflow
info!("App Init | Handling [node_vec] overflow"); info!("App Init | Handling [node_vec] overflow");
if og.p2pool.selected_index > app.og_node_vec.len() { if og.p2pool.selected_index > app.og_node_vec.len() {
warn!("App | Overflowing manual node index [{} > {}], resetting to 1", og.p2pool.selected_index, app.og_node_vec.len()); warn!("App | Overflowing manual node index [{} > {}]", og.p2pool.selected_index, app.og_node_vec.len());
let (name, node) = app.og_node_vec[0].clone(); let (name, node) = match app.og_node_vec.get(0) {
Some(zero) => zero.clone(),
None => Node::new_tuple(),
};
og.p2pool.selected_index = 0; og.p2pool.selected_index = 0;
og.p2pool.selected_name = name.clone(); og.p2pool.selected_name = name.clone();
og.p2pool.selected_ip = node.ip.clone(); og.p2pool.selected_ip = node.ip.clone();
@ -438,7 +441,10 @@ impl App {
info!("App Init | Handling [pool_vec] overflow..."); info!("App Init | Handling [pool_vec] overflow...");
if og.xmrig.selected_index > app.og_pool_vec.len() { if og.xmrig.selected_index > app.og_pool_vec.len() {
warn!("App | Overflowing manual pool index [{} > {}], resetting to 1", og.xmrig.selected_index, app.og_pool_vec.len()); warn!("App | Overflowing manual pool index [{} > {}], resetting to 1", og.xmrig.selected_index, app.og_pool_vec.len());
let (name, pool) = app.og_pool_vec[0].clone(); let (name, pool) = match app.og_pool_vec.get(0) {
Some(zero) => zero.clone(),
None => Pool::new_tuple(),
};
og.xmrig.selected_index = 0; og.xmrig.selected_index = 0;
og.xmrig.selected_name = name.clone(); og.xmrig.selected_name = name.clone();
og.xmrig.selected_ip = pool.ip.clone(); og.xmrig.selected_ip = pool.ip.clone();