From eb0b2c429faf9bfa3c472c198deca8f7f07f46f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Fri, 4 Feb 2022 17:15:21 +0100
Subject: [PATCH] fix: crash on empty search

---
 src/client_server/search.rs |  9 +++++----
 src/database/rooms.rs       | 29 +++++++++++++++--------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/client_server/search.rs b/src/client_server/search.rs
index 59c9480a..f492292c 100644
--- a/src/client_server/search.rs
+++ b/src/client_server/search.rs
@@ -44,11 +44,12 @@ pub async fn search_events_route(
             ));
         }
 
-        let search = db
+        if let Some(search) = db
             .rooms
-            .search_pdus(&room_id, &search_criteria.search_term)?;
-
-        searches.push(search.0.peekable());
+            .search_pdus(&room_id, &search_criteria.search_term)?
+        {
+            searches.push(search.0.peekable());
+        }
     }
 
     let skip = match body.next_batch.as_ref().map(|s| s.parse()) {
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 2c271d16..0abd2e79 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -2771,7 +2771,7 @@ impl Rooms {
         &'a self,
         room_id: &RoomId,
         search_string: &str,
-    ) -> Result<(impl Iterator<Item = Vec<u8>> + 'a, Vec<String>)> {
+    ) -> Result<Option<(impl Iterator<Item = Vec<u8>> + 'a, Vec<String>)>> {
         let prefix = self
             .get_shortroomid(room_id)?
             .expect("room exists")
@@ -2799,19 +2799,20 @@ impl Rooms {
                 .map(|(key, _)| key[key.len() - size_of::<u64>()..].to_vec())
         });
 
-        Ok((
-            utils::common_elements(iterators, |a, b| {
-                // We compare b with a because we reversed the iterator earlier
-                b.cmp(a)
-            })
-            .unwrap()
-            .map(move |id| {
-                let mut pduid = prefix_clone.clone();
-                pduid.extend_from_slice(&id);
-                pduid
-            }),
-            words,
-        ))
+        Ok(utils::common_elements(iterators, |a, b| {
+            // We compare b with a because we reversed the iterator earlier
+            b.cmp(a)
+        })
+        .map(|iter| {
+            (
+                iter.map(move |id| {
+                    let mut pduid = prefix_clone.clone();
+                    pduid.extend_from_slice(&id);
+                    pduid
+                }),
+                words,
+            )
+        }))
     }
 
     #[tracing::instrument(skip(self))]