mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 18:17:20 +00:00
Code Issues Releases Wiki Activity

Fix crash with malformed hexadecimal HTML entities

Browse Source 
Fixes #3373
This commit is contained in:
Jermolene 2018-07-28 16:22:38 +01:00
parent a3a4c28143
commit 4b9bc1b766
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/modules/utils/utils.js
View File

@ -497,15 +497,21 @@ exports.htmlEncode = function(s) {
// Converts all HTML entities to their character equivalents
exports.entityDecode = function(s) {
var converter = String.fromCodePoint || String.fromCharCode,
e = s.substr(1,s.length-2); // Strip the & and the ;
e = s.substr(1,s.length-2), // Strip the & and the ;
c;
if(e.charAt(0) === "#") {
if(e.charAt(1) === "x" || e.charAt(1) === "X") {
return converter(parseInt(e.substr(2),16));
c = parseInt(e.substr(2),16);
} else {
return converter(parseInt(e.substr(1),10));
c = parseInt(e.substr(1),10);
}
if(isNaN(c)) {
return s;
} else {
return converter(c);
}
} else {
var c = $tw.config.htmlEntities[e];
c = $tw.config.htmlEntities[e];
if(c) {
return converter(c);
} else {