From 7e388fb2bc784568734592dcb2e863dfa061bed4 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Tue, 18 Apr 2017 17:55:20 +0200 Subject: signal-protocol/omemo: fix null-pointer issues Fixes #44 and #58 --- plugins/omemo/src/session_store.vala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'plugins/omemo/src/session_store.vala') diff --git a/plugins/omemo/src/session_store.vala b/plugins/omemo/src/session_store.vala index f70e16ea..333fdc08 100644 --- a/plugins/omemo/src/session_store.vala +++ b/plugins/omemo/src/session_store.vala @@ -15,11 +15,10 @@ private class BackedSessionStore : SimpleSessionStore { private void init() { try { - Address addr = new Address(); foreach (Row row in db.session.select().with(db.session.identity_id, "=", identity_id)) { - addr.name = row[db.session.address_name]; - addr.device_id = row[db.session.device_id]; + Address addr = new Address(row[db.session.address_name], row[db.session.device_id]); store_session(addr, Base64.decode(row[db.session.record_base64])); + addr.device_id = 0; } } catch (Error e) { print(@"OMEMO: Error while initializing session store: $(e.message)\n"); -- cgit v1.2.3-54-g00ecf