imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid soft crash if unknown device in verification

Browse source 
Rageshakes from the wild indicate that device was null here which
implies that we somehow did not know about the device when verifiying
it? Log and null-check to avoid a soft crash.
This commit is contained in:
David Baker 2020-05-12 11:05:30 +01:00
parent 03fce86699
commit 5c0920da42
3 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/verification/VerificationShowSas.js
View file

@ -30,6 +30,7 @@ export default class VerificationShowSas extends React.Component {
static propTypes = {
pending: PropTypes.bool,
displayName: PropTypes.string, // required if pending is true
device: PropTypes.object,
onDone: PropTypes.func.isRequired,
onCancel: PropTypes.func.isRequired,
sas: PropTypes.object.isRequired,
@ -116,9 +117,11 @@ export default class VerificationShowSas extends React.Component {
let text;
if (this.state.pending) {
if (this.props.isSelf) {
// device shouldn't be null in this situation but it seems like it can be, so show
// slightly broken text rather than soft-crashing (we've already logged in VerificationPanel).
text = _t("Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…", {
deviceName: this.props.device.getDisplayName(),
deviceId: this.props.device.deviceId,
deviceName: this.props.device ? this.props.device.getDisplayName() : '',
deviceId: this.props.device ? this.props.device.deviceId : '',
});
} else {
const {displayName} = this.props;