diff --git a/js/libtextsecure.js b/js/libtextsecure.js index f889caa5725..ff7d2b0f268 100644 --- a/js/libtextsecure.js +++ b/js/libtextsecure.js @@ -38741,8 +38741,10 @@ textsecure.processDecrypted = function(decrypted, source) { if (decrypted.flags == null) decrypted.flags = 0; - if (decrypted.sync !== null && textsecure.storage.user.getNumber() != source) - throw new Error("Got sync context on a message not from a peer device"); + if (decrypted.sync !== null && textsecure.storage.user.getNumber() != source) { + // Ignore erroneous or malicious sync context from different number + decrypted.sync = null; + } if ((decrypted.flags & textsecure.protobuf.PushMessageContent.Flags.END_SESSION) == textsecure.protobuf.PushMessageContent.Flags.END_SESSION) { diff --git a/libtextsecure/helpers.js b/libtextsecure/helpers.js index 419d0743360..4e9eddc8f1a 100644 --- a/libtextsecure/helpers.js +++ b/libtextsecure/helpers.js @@ -156,8 +156,10 @@ textsecure.processDecrypted = function(decrypted, source) { if (decrypted.flags == null) decrypted.flags = 0; - if (decrypted.sync !== null && textsecure.storage.user.getNumber() != source) - throw new Error("Got sync context on a message not from a peer device"); + if (decrypted.sync !== null && textsecure.storage.user.getNumber() != source) { + // Ignore erroneous or malicious sync context from different number + decrypted.sync = null; + } if ((decrypted.flags & textsecure.protobuf.PushMessageContent.Flags.END_SESSION) == textsecure.protobuf.PushMessageContent.Flags.END_SESSION) {