Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-19 01:23:49 +00:00
Code Issues Projects Releases Wiki Activity

Improve defence against corrupt skins

Browse source
This commit is contained in:
Jordan Eldredge 2018-07-11 16:36:34 -07:00
parent e1e4d986e4
commit 535991b4b4
2 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
experiments/automatedScreenshots/shooter.js
View file

@ -35,9 +35,13 @@ class Shooter {
_validateZip(u) {
return new Promise((resolve, reject) => {
fs.readFile(u, (err, buffer) => {
JSZip.loadAsync(buffer).then(resolve, reject);
});
try {
fs.readFile(u, (err, buffer) => {
JSZip.loadAsync(buffer).then(resolve, reject);
});
} catch (e) {
reject(e);
}
});
}

26
js/actionCreators/files.js
View file

@ -82,16 +82,22 @@ export function loadFilesFromReferences(
export function setSkinFromArrayBuffer(arrayBuffer) {
return async dispatch => {
dispatch({ type: LOADING });
const skinData = await skinParser(arrayBuffer);
dispatch({
type: SET_SKIN_DATA,
skinImages: skinData.images,
skinColors: skinData.colors,
skinPlaylistStyle: skinData.playlistStyle,
skinCursors: skinData.cursors,
skinRegion: skinData.region,
skinGenLetterWidths: skinData.genLetterWidths
});
try {
const skinData = await skinParser(arrayBuffer);
dispatch({
type: SET_SKIN_DATA,
skinImages: skinData.images,
skinColors: skinData.colors,
skinPlaylistStyle: skinData.playlistStyle,
skinCursors: skinData.cursors,
skinRegion: skinData.region,
skinGenLetterWidths: skinData.genLetterWidths
});
} catch (e) {
console.error(e);
dispatch({ type: LOADED });
alert(`Failed to parse skin`);
}
};
}