kiwix/kiwix-js
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js.git synced 2025-09-23 20:44:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prevent app crash with malformed anchor hrefs #430 (#432)

Browse Source 
Fixes #430 .
This commit is contained in:
Jaifroid 2018-11-06 09:40:00 +00:00 committed by GitHub
parent ed75f71058
commit 92c74edbe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
www/js/app.js
View File

@ -884,39 +884,42 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies','abstractFiles
var escapedUrl = encodeURIComponent(dirEntry.url).replace(/([\\$^.|?*+\/()[{])/g, '\\$1');
// Pattern to match a local anchor in an href even if prefixed by escaped url
var regexpLocalAnchorHref = new RegExp('^(?:#|' + escapedUrl + '#)([^#]+$)');
$('#articleContent').contents().find('body').find('a').each(function() {
var href = $(this).attr('href');
// Compute current link's url (with its namespace), if applicable
var zimUrl = regexpZIMUrlWithNamespace.test(this.href) ? this.href.match(regexpZIMUrlWithNamespace)[1] : '';
if (href === null || href === undefined) {
// No href attribute
$('#articleContent').contents().find('body').find('a').each(function () {
// Attempts to access any properties of 'this' with malformed URLs causes app crash in Edge/UWP [kiwix-js #430]
try {
var testHref = this.href;
} catch (err) {
console.error("Malformed href caused error:" + err.message);
return;
}
else if (href.length === 0) {
var href = this.getAttribute('href');
if (href === null || href === undefined) return;
// Compute current link's url (with its namespace), if applicable
// NB We need to access 'this.href' here because, unlike 'this.getAttribute("href")', it contains the fully qualified URL [kiwix-js #432]
var zimUrl = regexpZIMUrlWithNamespace.test(this.href) ? this.href.match(regexpZIMUrlWithNamespace)[1] : '';
if (href.length === 0) {
// It's a link with an empty href, pointing to the current page.
// Because of the base tag, we need to modify it
$(this).on('click', function(e) {
return false;
$(this).on('click', function (e) {
return false;
});
}
else if (regexpLocalAnchorHref.test(href)) {
} else if (regexpLocalAnchorHref.test(href)) {
// It's an anchor link : we need to make it work with javascript
// because of the base tag
var anchorRef = href.replace(regexpLocalAnchorHref, '$1');
$(this).on('click', function(e) {
$(this).on('click', function (e) {
document.getElementById('articleContent').contentWindow.location.hash = anchorRef;
return false;
});
}
else if (this.protocol !== currentProtocol
|| this.host !== currentHost) {
} else if (this.protocol !== currentProtocol ||
this.host !== currentHost) {
// It's an external URL : we should open it in a new tab
$(this).attr("target", "_blank");
}
else {
this.target = "_blank";
} else {
// It's a link to another article
// Add an onclick event to go to this article
// instead of following the link
$(this).on('click', function(e) {
$(this).on('click', function (e) {
var decodedURL = decodeURIComponent(zimUrl);
goToArticle(decodedURL);
return false;