styled-exceljs 0.21.4 → 0.21.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "styled-exceljs",
-	"version": "0.21.4",
+	"version": "0.21.6",
 	"author": "sheetjs",
 	"description": "SheetJS CE fork with enhanced XLS/XLSX styling and browser rendering",
 	"keywords": [
@@ -140,12 +140,14 @@
 	},
 	"repository": {
 		"type": "git",
-		"url": "https://git.sheetjs.com/SheetJS/sheetjs"
+		"url": "git+https://github.com/flyfish-dev/styled-exceljs.git"
 	},
 	"scripts": {
 		"test": "make travis",
 		"test:security": "node tests/security-prototype-pollution.mjs",
 		"test:table-styles": "node tests/table-styles.mjs",
+		"test:cfb-minifat": "node tests/cfb-minifat.mjs && XLSX_TEST_MODULE=./xlsx.mjs node tests/cfb-minifat.mjs",
+		"test:corpus": "node node_modules/mocha/bin/mocha.js --require ./tests/runtime-identity.cjs -R dot -t 30000 test.js && node node_modules/mocha/bin/mocha.js --require ./tests/runtime-identity.cjs -R dot -t 30000 test.mjs",
 		"build": "make",
 		"lint": "make fullint",
 		"dtslint": "dtslint types"
@@ -166,7 +168,7 @@
 			"holes"
 		]
 	},
-	"homepage": "https://sheetjs.com/",
+	"homepage": "https://github.com/flyfish-dev/styled-exceljs#readme",
 	"files": [
 		"CHANGELOG.md",
 		"LICENSE",
@@ -187,7 +189,7 @@
 		"types/tsconfig.json"
 	],
 	"bugs": {
-		"url": "https://git.sheetjs.com/SheetJS/sheetjs/issues"
+		"url": "https://github.com/flyfish-dev/styled-exceljs/issues"
 	},
 	"license": "Apache-2.0",
 	"engines": {

package/xlsx.js

@@ -4,7 +4,7 @@
 /*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false, DataView:false, Deno:false, Set:false, Float32Array:false, Int8Array:false */
 var XLSX = {};
 function make_xlsx_lib(XLSX){
-XLSX.version = '0.21.4';
+XLSX.version = '0.21.6';
 var current_codepage = 1200, current_ansi = 1252;
 /*global cptable:true, window */
 var $cptable;
@@ -1663,8 +1663,12 @@ sleuth_fat(difat_start, difat_sec_cnt, sectors, ssz, fat_addrs);
 /** Chains */
 var sector_list = make_sector_list(sectors, dir_start, fat_addrs, ssz);
 
-if(dir_start < sector_list.length) sector_list[dir_start].name = "!Directory";
-if(nmfs > 0 && minifat_start !== ENDOFCHAIN) sector_list[minifat_start].name = "!MiniFAT";
+if(!sector_list[dir_start]) throw new Error("CFB directory chain is missing");
+sector_list[dir_start].name = "!Directory";
+/* A stale MiniFAT location is irrelevant when no live entry uses mini streams.
+ * Validate required chains when reading their live directory entries. */
+if(nmfs > 0 && sector_list[minifat_start]) sector_list[minifat_start].name = "!MiniFAT";
+if(!sector_list[fat_addrs[0]]) throw new Error("CFB FAT chain is missing");
 sector_list[fat_addrs[0]].name = "!FAT";
 sector_list.fat_addrs = fat_addrs;
 sector_list.ssz = ssz;
@@ -1876,10 +1880,14 @@ function read_directory(dir_start, sector_list, sectors, Paths, nmfs, files, Fil
 		if(mtime !== 0) o.mt = read_date(blob, blob.l-8);
 		o.start = blob.read_shift(4, 'i');
 		o.size = blob.read_shift(4, 'i');
+		if(o.type === 0) { o.size = 0; o.start = ENDOFCHAIN; }
 		if(o.size < 0 && o.start < 0) { o.size = o.type = 0; o.start = ENDOFCHAIN; o.name = ""; }
 		if(o.type === 5) { /* root */
-			minifat_store = o.start;
-			if(nmfs > 0 && minifat_store !== ENDOFCHAIN) sector_list[minifat_store].name = "!StreamData";
+			minifat_store = o.size > 0 ? o.start : ENDOFCHAIN;
+			if(o.size > 0 && nmfs > 0) {
+				if(!sector_list[minifat_store]) throw new Error("CFB root mini stream is missing");
+				sector_list[minifat_store].name = "!StreamData";
+			}
 			/*minifat_size = o.size;*/
 		} else if(o.size >= 4096 /* MSCSZ */) {
 			o.storage = 'fat';
@@ -1889,8 +1897,11 @@ function read_directory(dir_start, sector_list, sectors, Paths, nmfs, files, Fil
 		} else {
 			o.storage = 'minifat';
 			if(o.size < 0) o.size = 0;
-			else if(minifat_store !== ENDOFCHAIN && o.start !== ENDOFCHAIN && sector_list[minifat_store]) {
-				o.content = get_mfat_entry(o, sector_list[minifat_store].data, (sector_list[mini]||{}).data);
+			else if(o.type === 2 && o.size > 0) {
+				if(nmfs < 1 || !sector_list[mini]) throw new Error("CFB MiniFAT chain is missing for stream: " + o.name);
+				if(!sector_list[minifat_store]) throw new Error("CFB root mini stream is missing");
+				o.content = get_mfat_entry(o, sector_list[minifat_store].data, sector_list[mini].data);
+				if(o.content.length !== o.size) throw new Error("CFB mini stream is truncated: " + o.name);
 			}
 		}
 		if(o.content) prep_blob(o.content, 0);
@@ -3220,7 +3231,6 @@ exports.utils = {
 
 return exports;
 })();
-
 var _fs;
 function set_fs(fs) { _fs = fs; }
 

package/xlsx.mjs

@@ -3,7 +3,7 @@
 /*exported XLSX */
 /*global process:false, Buffer:false, ArrayBuffer:false, DataView:false, Deno:false */
 var XLSX = {};
-XLSX.version = '0.21.4';
+XLSX.version = '0.21.6';
 var current_codepage = 1200, current_ansi = 1252;
 /*:: declare var cptable:any; */
 /*global cptable:true, window */
@@ -1725,8 +1725,12 @@ sleuth_fat(difat_start, difat_sec_cnt, sectors, ssz, fat_addrs);
 /** Chains */
 var sector_list/*:SectorList*/ = make_sector_list(sectors, dir_start, fat_addrs, ssz);
 
-if(dir_start < sector_list.length) sector_list[dir_start].name = "!Directory";
-if(nmfs > 0 && minifat_start !== ENDOFCHAIN) sector_list[minifat_start].name = "!MiniFAT";
+if(!sector_list[dir_start]) throw new Error("CFB directory chain is missing");
+sector_list[dir_start].name = "!Directory";
+/* A stale MiniFAT location is irrelevant when no live entry uses mini streams.
+ * Validate required chains when reading their live directory entries. */
+if(nmfs > 0 && sector_list[minifat_start]) sector_list[minifat_start].name = "!MiniFAT";
+if(!sector_list[fat_addrs[0]]) throw new Error("CFB FAT chain is missing");
 sector_list[fat_addrs[0]].name = "!FAT";
 sector_list.fat_addrs = fat_addrs;
 sector_list.ssz = ssz;
@@ -1938,10 +1942,14 @@ function read_directory(dir_start/*:number*/, sector_list/*:SectorList*/, sector
 		if(mtime !== 0) o.mt = read_date(blob, blob.l-8);
 		o.start = blob.read_shift(4, 'i');
 		o.size = blob.read_shift(4, 'i');
+		if(o.type === 0) { o.size = 0; o.start = ENDOFCHAIN; }
 		if(o.size < 0 && o.start < 0) { o.size = o.type = 0; o.start = ENDOFCHAIN; o.name = ""; }
 		if(o.type === 5) { /* root */
-			minifat_store = o.start;
-			if(nmfs > 0 && minifat_store !== ENDOFCHAIN) sector_list[minifat_store].name = "!StreamData";
+			minifat_store = o.size > 0 ? o.start : ENDOFCHAIN;
+			if(o.size > 0 && nmfs > 0) {
+				if(!sector_list[minifat_store]) throw new Error("CFB root mini stream is missing");
+				sector_list[minifat_store].name = "!StreamData";
+			}
 			/*minifat_size = o.size;*/
 		} else if(o.size >= 4096 /* MSCSZ */) {
 			o.storage = 'fat';
@@ -1951,8 +1959,11 @@ function read_directory(dir_start/*:number*/, sector_list/*:SectorList*/, sector
 		} else {
 			o.storage = 'minifat';
 			if(o.size < 0) o.size = 0;
-			else if(minifat_store !== ENDOFCHAIN && o.start !== ENDOFCHAIN && sector_list[minifat_store]) {
-				o.content = get_mfat_entry(o, sector_list[minifat_store].data, (sector_list[mini]||{}).data);
+			else if(o.type === 2 && o.size > 0) {
+				if(nmfs < 1 || !sector_list[mini]) throw new Error("CFB MiniFAT chain is missing for stream: " + o.name);
+				if(!sector_list[minifat_store]) throw new Error("CFB root mini stream is missing");
+				o.content = get_mfat_entry(o, sector_list[minifat_store].data, sector_list[mini].data);
+				if(o.content.length !== o.size) throw new Error("CFB mini stream is truncated: " + o.name);
 			}
 		}
 		if(o.content) prep_blob(o.content, 0);
@@ -3288,7 +3299,6 @@ exports.utils = {
 
 return exports;
 })();
-
 var _fs;
 function set_fs(fs) { _fs = fs; }