kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-09-19 01:13:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Port latest update from kiwix-js

Browse Source 
Former-commit-id: 162999bfdf0307ec4475e457d1764da5ad297ac0 [formerly de0f5bc804c13487e57cb6616ca8c028053f0db7 [formerly 67e53c2663870823cd65a348175c642ed9e48593]]
Former-commit-id: 162c0bef7cef69823714901f29a1233d63eff227
Former-commit-id: 4f48819bb0d804e9d33205b5339858179c0fe831
This commit is contained in:
Jaifroid 2020-09-03 08:30:36 +01:00
parent c6489080ff
commit 08fc37e19c
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
www/js/lib/zimfile.js
View File

@ -191,7 +191,17 @@ define(['xzdec_wrapper', 'zstdec_wrapper', 'util', 'utf8', 'q', 'zimDirEntry'],
return that._readSlice(clusterOffset, 1).then(function(compressionType) { return that._readSlice(clusterOffset, 1).then(function(compressionType) {
var decompressor; var decompressor;
var plainBlobReader = function(offset, size) { var plainBlobReader = function(offset, size) {
return that._readSlice(clusterOffset + 1 + offset, size); // DEV: old algorithm merely returned requested data size
// but I believe we need to check that we are not reading beyond the end of the cluster
// Is this an oversight in original code or an unnecessary protection?
// return that._readSlice(clusterOffset + 1 + offset, size);
var offsetStart = clusterOffset + 1 + offset;
if ( offsetStart < nextCluster) {
size = offsetStart + size <= nextCluster ? size : nextCluster - offsetStart;
return that._readSlice(offsetStart, size);
} else {
return Q(new Uint8Array(0).buffer);
}
}; };
if (compressionType[0] === 0 || compressionType[0] === 1) { if (compressionType[0] === 0 || compressionType[0] === 1) {
// uncompressed // uncompressed
@ -226,14 +236,6 @@ define(['xzdec_wrapper', 'zstdec_wrapper', 'util', 'utf8', 'q', 'zimDirEntry'],
function readMimetypeMap(file, mimeListPos, urlPtrPos) { function readMimetypeMap(file, mimeListPos, urlPtrPos) {
var typeMap = new Map; var typeMap = new Map;
var size = urlPtrPos - mimeListPos; var size = urlPtrPos - mimeListPos;
// DIAGNOSTICS FOR Kiwix JS Windows #89
if (size > 1024) {
console.warn("WARNING: " + file.name + " has urlPtrPos at offset " + urlPtrPos + ".\n" +
"Attempted to read an arrayBuffer of **" + Math.floor(size / 10485.76) / 100 + " MB** while extracting MIME type table!\n" +
"We limited the buffer size to 1024 bytes.");
} else {
console.log("MIME type table of " + file.name + " is " + size + " bytes.");
}
// ZIM archives produced since May 2020 relocate the URL Pointer List to the end of the archive // ZIM archives produced since May 2020 relocate the URL Pointer List to the end of the archive
// so we limit the slice size to max 1024 bytes in order to prevent reading the entire archive into an array buffer // so we limit the slice size to max 1024 bytes in order to prevent reading the entire archive into an array buffer
// See https://github.com/openzim/libzim/issues/353 // See https://github.com/openzim/libzim/issues/353