Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-10 13:37:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prevent all strings from being parsed as JSON.

Browse Source
This commit is contained in:
Ajay Ramachandran
2020-02-08 20:15:49 -05:00
parent be3a4a4e91
commit 94af8ab301
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/config.ts
View File

@@ -84,7 +84,6 @@ class SBMap<T, U> extends Map {
}
}
var Config: SBObject = {
/**
* Callback function when an option is updated
@@ -138,11 +137,11 @@ function encodeStoredItem(data) {
* @param {*} data
*/
function decodeStoredItem(id: string, data) {
if(!Config.defaults[id]) return data;
if (!Config.defaults[id]) return data;
if(Config.defaults[id] instanceof SBMap) {
if (Config.defaults[id] instanceof SBMap) {
try {
if(!Array.isArray(data)) return data;
if (!Array.isArray(data)) return data;
return new SBMap(id, data);
} catch(e) {
console.error("Failed to parse SBMap: "+ id);
@@ -151,10 +150,14 @@ function decodeStoredItem(id: string, data) {
// This is the old format for SBMap (a JSON string)
if (typeof data === "string") {
try {
let str = JSON.parse(data);
if(Array.isArray(data)) {
return new SBMap(id, str)
if (Array.isArray(data)) {
return new SBMap(id, str);
}
} catch(e) {
// Continue normally (out of this if statement)
}
}