Merge pull request #862 from uhoreg/check_resolver

make sure resolve object is defined before calling it
matrix-org · Mar 20, 2019 · d5c6dcf · d5c6dcf
2 parents 6a57ddd + bd711cd
commit d5c6dcf
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/crypto/olmlib.js b/src/crypto/olmlib.js
@@ -237,18 +237,24 @@ module.exports.ensureOlmSessionsForDevices = async function(
                 const msg = "No one-time keys (alg=" + oneTimeKeyAlgorithm +
                       ") for device " + userId + ":" + deviceId;
                 logger.warn(msg);
-                resolveSession[key].resolve();
+                if (resolveSession[key]) {
+                    resolveSession[key].resolve();
+                }
                 continue;
             }
 
             promises.push(
                 _verifyKeyAndStartSession(
                     olmDevice, oneTimeKey, userId, deviceInfo,
                 ).then((sid) => {
-                    resolveSession[key].resolve(sid);
+                    if (resolveSession[key]) {
+                        resolveSession[key].resolve(sid);
+                    }
                     result[userId][deviceId].sessionId = sid;
                 }, (e) => {
-                    resolveSession[key].resolve();
+                    if (resolveSession[key]) {
+                        resolveSession[key].resolve();
+                    }
                     throw e;
                 }),
             );