mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2025-01-11 04:27:40 +01:00
Code Issues Projects Releases Wiki Activity

ensure olm Account in dehydrated device is freed on error

Browse Source
This commit is contained in:
Bruno Windels 2021-10-28 11:52:32 +02:00
parent bef12c7a8f
commit 544019f67d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/matrix/SessionContainer.js
View File

@ -189,6 +189,8 @@ export class SessionContainer {
log.set("status", this._status.get()); log.set("status", this._status.get());
} catch (err) { } catch (err) {
log.catch(err); log.catch(err);
// free olm Account that might be contained
dehydratedDevice?.dispose();
this._error = err; this._error = err;
this._status.set(LoadStatus.Error); this._status.set(LoadStatus.Error);
} }

7
src/matrix/e2ee/Dehydration.js
View File

@ -90,11 +90,16 @@ class DehydratedDevice {
// make it clear that ownership is transfered upon calling this // make it clear that ownership is transfered upon calling this
adoptUnpickledOlmAccount() { adoptUnpickledOlmAccount() {
const account = this._account; const account = this._account;
this._account = null; this._account = undefined;
return account; return account;
} }
get deviceId() { get deviceId() {
return this._dehydratedDevice.device_id; return this._dehydratedDevice.device_id;
} }
dispose() {
this._account?.free();
this._account = undefined;
}
} }