diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2018-12-07 22:42:28 -0500 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2018-12-07 22:42:28 -0500 |
| commit | c915567517ba952bd640d712cd19fdeee32c7433 (patch) | |
| tree | 87c0b008e57be9a94132b94979fe52cfbcddf550 | |
| parent | Merge branch 'develop' into e2e_cross-signing (diff) | |
| download | synapse-github/uhoreg/e2e_cross-signing.tar.xz | |
don't try to modify a non-existant result github/uhoreg/e2e_cross-signing uhoreg/e2e_cross-signing
| -rw-r--r-- | synapse/storage/end_to_end_keys.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py index edfacf36db..6b732cf670 100644 --- a/synapse/storage/end_to_end_keys.py +++ b/synapse/storage/end_to_end_keys.py @@ -153,7 +153,8 @@ class EndToEndKeyStore(SQLBaseStore): user_id = attestation["user_id"] device_id = attestation["device_id"] # FIXME: combine signatures of the same payload? - if user_id in result and device_id in result[user_id]: + if user_id in result and device_id in result[user_id] \ + and result[user_id][device_id]: result[user_id][device_id].setdefault("attestations", []) \ .append(attestation) |