edward/bunbun
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add config-parsing-time check for argument count range

Browse source
This commit is contained in:
Edward Shen 2020-09-27 21:48:17 -04:00
parent 46261bdfa0
commit 83a2ba0f8a
Signed by: edward
GPG key ID: 19182661E818369F
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/config.rs
View file

@ -2,7 +2,7 @@ use crate::BunBunError;
use dirs::{config_dir, home_dir}; use dirs::{config_dir, home_dir};
use log::{debug, info, trace}; use log::{debug, info, trace};
use serde::{ use serde::{
de::{self, Deserializer, MapAccess, Visitor}, de::{self, Deserializer, MapAccess, Unexpected, Visitor},
Deserialize, Serialize, Deserialize, Serialize,
}; };
use std::collections::HashMap; use std::collections::HashMap;
@ -138,6 +138,20 @@ impl<'de> Deserialize<'de> for Route {
} }
} }
if let (Some(min_args), Some(max_args)) = (min_args, max_args) {
if min_args > max_args {
{
return Err(de::Error::invalid_value(
Unexpected::Other(&format!(
"argument count range {} to {}",
min_args, max_args
)),
&"a valid argument count range",
));
}
}
}
let path = path.ok_or_else(|| de::Error::missing_field("path"))?; let path = path.ok_or_else(|| de::Error::missing_field("path"))?;
Ok(Route { Ok(Route {
route_type: get_route_type(&path), route_type: get_route_type(&path),