mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Revoke object URLs in two error cases

Browse source
This commit is contained in:
Evan Hahn 2021-02-23 10:00:18 -06:00 • committed by Josh Perez
parent 1ee47735d9
commit c4551ca7ca
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/views/identicon_svg_view.js
View file

@ -1,4 +1,4 @@
// Copyright 2015-2020 Signal Messenger, LLC
// Copyright 2015-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global Whisper, loadImage */
@ -21,7 +21,7 @@
const svg = new Blob([html], { type: 'image/svg+xml;charset=utf-8' });
return URL.createObjectURL(svg);
},
getDataUrl() {
getDataUrl() /* : Promise<string> */ {
const svgurl = this.getSVGUrl();
return new Promise(resolve => {
const img = document.createElement('img');
@ -36,6 +36,11 @@
URL.revokeObjectURL(svgurl);
resolve(canvas.toDataURL('image/png'));
};
img.onerror = () => {
URL.revokeObjectURL(svgurl);
// If this fails for some reason, we'd rather continue on than reject.
resolve(undefined);
};
img.src = svgurl;
});