diff options
| author | David Robertson <davidr@element.io> | 2022-05-18 11:28:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-18 11:28:14 +0100 |
| commit | d4713d3e335b21d12284ddd8ebd00e38abcfd521 (patch) | |
| tree | ca02237e04ac9f1139a52e36c7c169e82d7b8cdf /synapse/storage/databases/main/events.py | |
| parent | Make handling of federation Authorization header (more) compliant with RFC723... (diff) | |
| download | synapse-d4713d3e335b21d12284ddd8ebd00e38abcfd521.tar.xz | |
Discard null-containing strings before updating the user directory (#12762)
Diffstat (limited to 'synapse/storage/databases/main/events.py')
| -rw-r--r-- | synapse/storage/databases/main/events.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py index 42d484dc98..0df8ff5395 100644 --- a/synapse/storage/databases/main/events.py +++ b/synapse/storage/databases/main/events.py @@ -52,6 +52,7 @@ from synapse.storage.util.sequence import SequenceGenerator from synapse.types import JsonDict, StateMap, get_domain_from_id from synapse.util import json_encoder from synapse.util.iterutils import batch_iter, sorted_topologically +from synapse.util.stringutils import non_null_str_or_none if TYPE_CHECKING: from synapse.server import HomeServer @@ -1728,9 +1729,6 @@ class PersistEventsStore: not affect the current local state. """ - def non_null_str_or_none(val: Any) -> Optional[str]: - return val if isinstance(val, str) and "\u0000" not in val else None - self.db_pool.simple_insert_many_txn( txn, table="room_memberships", |