Compare commits
2 commits
main
...
nex/fix/in
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc574d0f77 | ||
|
|
3992071980 |
2 changed files with 5 additions and 1 deletions
1
changelog.d/1265.bugfix
Normal file
1
changelog.d/1265.bugfix
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Fixed corrupted appservice registrations causing the server to enter a crash loop. Contributed by @nex.
|
||||||
|
|
@ -272,7 +272,10 @@ impl Service {
|
||||||
.get(id)
|
.get(id)
|
||||||
.await
|
.await
|
||||||
.and_then(|ref bytes| serde_saphyr::from_slice(bytes).map_err(Into::into))
|
.and_then(|ref bytes| serde_saphyr::from_slice(bytes).map_err(Into::into))
|
||||||
.map_err(|e| err!(Database("Invalid appservice {id:?} registration: {e:?}")))
|
.map_err(|e| {
|
||||||
|
self.db.id_appserviceregistrations.remove(id);
|
||||||
|
err!(Database("Invalid appservice {id:?} registration: {e:?}. Removed."))
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn read(&self) -> impl Future<Output = RwLockReadGuard<'_, Registrations>> + Send {
|
pub fn read(&self) -> impl Future<Output = RwLockReadGuard<'_, Registrations>> + Send {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue