fix: Don't crash on incomplete expressions

leoshimo · Nov 14, 2024 · 48f1c32 · 48f1c32
1 parent 243edc5
commit 48f1c32
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/vrsjmp/src-tauri/src/main.rs b/vrsjmp/src-tauri/src/main.rs
@@ -106,15 +106,19 @@ impl Client {
 fn set_query(query: &str, state: tauri::State<State>) -> Vec<serde_json::Value> {
     let mut matcher = state.matcher.lock().unwrap();
 
+    // TODO: Contents of `query` should be escaped
+    let request = match Form::from_expr(&format!("(begin (bind_srv :vrsjmp) (get_items \"{}\"))", query)) {
+        Ok(f) => f,
+        Err(lyric::Error::IncompleteExpression(_)) => return vec![],
+        Err(e) => {
+            error!("Invalid form for user query - {e}");
+            return vec![];
+        }
+    };
+
     let response = state
         .client
-        .request(
-            Form::from_expr(&format!(
-                "(begin (bind_srv :vrsjmp) (get_items \"{}\"))",
-                query
-            ))
-            .unwrap(),
-        )
+        .request(request)
         .unwrap();
 
     let items = match response.contents.unwrap() {