astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve safety of Blurhash component (#14278) 

There was a missed empty hash check. As well as rendering is now wrapped
in try/catch block, so app won't crash if any Blurhash component fails
to render its contents as it's not that critical.
pull/14280/head
Sasha Sorokin 2020-07-10 03:32:36 +07:00 committed by GitHub
parent 6fda3cbbeb
commit 3ef94c0044
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/javascript/mastodon/components/blurhash.js
View File

@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
/** /**
* @typedef BlurhashPropsBase * @typedef BlurhashPropsBase
* @property {string} hash Hash to render * @property {string?} hash Hash to render
* @property {number} width * @property {number} width
* Width of the blurred region in pixels. Defaults to 32 * Width of the blurred region in pixels. Defaults to 32
* @property {number} [height] * @property {number} [height]
@ -37,13 +37,17 @@ function Blurhash({
const { current: canvas } = canvasRef; const { current: canvas } = canvasRef;
canvas.width = canvas.width; // resets canvas canvas.width = canvas.width; // resets canvas
if (dummy) return; if (dummy || !hash) return;
const pixels = decode(hash, width, height); try {
const ctx = canvas.getContext('2d'); const pixels = decode(hash, width, height);
const imageData = new ImageData(pixels, width, height); const ctx = canvas.getContext('2d');
const imageData = new ImageData(pixels, width, height);
ctx.putImageData(imageData, 0, 0); ctx.putImageData(imageData, 0, 0);
} catch (err) {
console.error('Blurhash decoding failure', { err, hash });
}
}, [dummy, hash, width, height]); }, [dummy, hash, width, height]);
return ( return (