Merge pull request #441 from matrix-org/markjh/fts_skip_invalid

Skip events that where the body, name or topic isn't a string 

1 files changed, 5 insertions, 0 deletions

diff --git a/synapse/storage/search.py b/synapse/storage/search.py

index 39f600f53c..04246101df 100644
--- a/synapse/storage/search.py
+++ b/synapse/storage/search.py
@@ -85,6 +85,11 @@ class SearchStore(BackgroundUpdateStore):
                     # skip over it.
                     continue
 
+                if not isinstance(value, basestring):
+                    # If the event body, name or topic isn't a string
+                    # then skip over it
+                    continue
+
                 event_search_rows.append((event_id, room_id, key, value))
 
             if isinstance(self.database_engine, PostgresEngine):