Skip to content

web search done right

fix panic in bangs if url is malformed for some reason

Mikkel Denker27bcb083bc69
diff --git a/crates/core/src/bangs.rs b/crates/core/src/bangs.rs
index d88f40dc..4c4b397d 100644
--- a/crates/core/src/bangs.rs
+++ b/crates/core/src/bangs.rs
@@ -170,16 +170,15 @@ impl Bangs {
.collect::<String>();
let query = crate::urlencode(query.as_str());
- let mut url = bang.url.replace("{{{s}}}", query.as_str());
-
- if !url.contains("://") {
- url = "http://".to_string() + url.as_str();
- }
-
- return Some(BangHit {
- bang: bang.clone(),
- redirect_to: Url::parse(url.as_str()).unwrap().into(),
- });
+ let url = bang.url.replace("{{{s}}}", query.as_str());
+
+ return Url::parse(url.as_str())
+ .or_else(|_| Url::parse(&format!("https://{}", url)))
+ .ok()
+ .map(|url| BangHit {
+ bang: bang.clone(),
+ redirect_to: url.into(),
+ });
}
}