From 1131b82414e515df1f74bd50f70e17f7b8c4f79f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 11 Mar 2016 14:18:30 +0000 Subject: [PATCH] Don't crash on redacted (or otherwise invalid) 3pid invites --- src/components/views/rooms/MemberList.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js index 175161e1c9a..cc2983290b6 100644 --- a/src/components/views/rooms/MemberList.js +++ b/src/components/views/rooms/MemberList.js @@ -348,6 +348,7 @@ module.exports = React.createClass({ ); }); + // XXX: surely this is not the right home for this logic. if (membership === "invite") { // include 3pid invites (m.room.third_party_invite) state events. // The HS may have already converted these into m.room.member invites so @@ -358,6 +359,12 @@ module.exports = React.createClass({ if (room) { room.currentState.getStateEvents("m.room.third_party_invite").forEach( function(e) { + // any events without these keys are not valid 3pid invites, so we ignore them + var required_keys = ['key_validity_url', 'public_key', 'display_name']; + for (var i = 0; i < required_keys.length; ++i) { + if (e.getContent()[required_keys[i]] === undefined) return; + } + // discard all invites which have a m.room.member event since we've // already added them. var memberEvent = room.currentState.getInviteForThreePidToken(e.getStateKey());