提交 257d4e6d 编写于 作者: S SheetJS

version bump 0.16.0

closes #1904 h/t
- @atcazzual : Adam Cazzolla of the Sonatype Security Research team
- @davisjam  : James (Jamie) Davis of Virginia Tech
上级 34683954
...@@ -4,6 +4,11 @@ This log is intended to keep track of backwards-incompatible changes, including ...@@ -4,6 +4,11 @@ This log is intended to keep track of backwards-incompatible changes, including
but not limited to API changes and file location changes. Minor behavioral but not limited to API changes and file location changes. Minor behavioral
changes may not be included if they are not expected to break existing code. changes may not be included if they are not expected to break existing code.
## v0.16.0
* Date handling changed
* XLML certain tag tests are now case insensitive
* Fixed potentially vulnerable regular expressions
## v0.15.6 ## v0.15.6
* CFB prevent infinite loop * CFB prevent infinite loop
......
XLSX.version = '0.15.6'; XLSX.version = '0.16.0';
...@@ -172,7 +172,7 @@ function xlml_normalize(d)/*:string*/ { ...@@ -172,7 +172,7 @@ function xlml_normalize(d)/*:string*/ {
/* TODO: Everything */ /* TODO: Everything */
/* UOS uses CJK in tags */ /* UOS uses CJK in tags */
var xlmlregex = /<(\/?)([^\s?>!\/:]*:|)([^\s?>:\/]+)[^>]*>/mg; var xlmlregex = /<(\/?)([^\s?><!\/:]*:|)([^\s?<>:\/]+)(?:[\s?:\/][^>]*)?>/mg;
//var xlmlregex = /<(\/?)([a-z0-9]*:|)(\w+)[^>]*>/mg; //var xlmlregex = /<(\/?)([a-z0-9]*:|)(\w+)[^>]*>/mg;
function parse_xlml_xml(d, _opts)/*:Workbook*/ { function parse_xlml_xml(d, _opts)/*:Workbook*/ {
var opts = _opts || {}; var opts = _opts || {};
......
...@@ -196,7 +196,7 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet ...@@ -196,7 +196,7 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet
var _range = safe_decode_range(ws['!ref']); var _range = safe_decode_range(ws['!ref']);
range.e.c = Math.max(range.e.c, _range.e.c); range.e.c = Math.max(range.e.c, _range.e.c);
range.e.r = Math.max(range.e.r, _range.e.r); range.e.r = Math.max(range.e.r, _range.e.r);
if(_R == -1) { _R = range.e.r + 1; range.e.r = _R + js.length - 1 + offset; } if(_R == -1) { _R = _range.e.r + 1; range.e.r = _R + js.length - 1 + offset; }
} }
var hdr/*:Array<string>*/ = o.header || [], C = 0; var hdr/*:Array<string>*/ = o.header || [], C = 0;
......
此差异由.gitattributes 抑制。
此差异由.gitattributes 抑制。
此差异由.gitattributes 抑制。
此差异由.gitattributes 抑制。
此差异由.gitattributes 抑制。
此差异由.gitattributes 抑制。
此差异由.gitattributes 抑制。
此差异由.gitattributes 抑制。
此差异由.gitattributes 抑制。
此差异由.gitattributes 抑制。
{ {
"name": "xlsx", "name": "xlsx",
"version": "0.15.6", "version": "0.16.0",
"author": "sheetjs", "author": "sheetjs",
"description": "SheetJS Spreadsheet data parser and writer", "description": "SheetJS Spreadsheet data parser and writer",
"keywords": [ "keywords": [
......
...@@ -1429,6 +1429,7 @@ function datenum(v/*:Date*/, date1904/*:?boolean*/)/*:number*/ { ...@@ -1429,6 +1429,7 @@ function datenum(v/*:Date*/, date1904/*:?boolean*/)/*:number*/ {
return (epoch - dnthresh) / (24 * 60 * 60 * 1000); return (epoch - dnthresh) / (24 * 60 * 60 * 1000);
} }
var good_pd_date = new Date('2017-02-19T19:06:09.000Z'); var good_pd_date = new Date('2017-02-19T19:06:09.000Z');
if(isNaN(good_pd_date.getFullYear())) good_pd_date = new Date('2017-02-19T19:06:09');
if(isNaN(good_pd_date.getFullYear())) good_pd_date = new Date('2/19/17'); if(isNaN(good_pd_date.getFullYear())) good_pd_date = new Date('2/19/17');
var good_pd = good_pd_date.getFullYear() == 2017; var good_pd = good_pd_date.getFullYear() == 2017;
function parseDate(str/*:string|Date*/)/*:Date*/ { function parseDate(str/*:string|Date*/)/*:Date*/ {
......
此差异由.gitattributes 抑制。
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */ /*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
var XLSX = {}; var XLSX = {};
function make_xlsx_lib(XLSX){ function make_xlsx_lib(XLSX){
XLSX.version = '0.15.6'; XLSX.version = '0.16.0';
var current_codepage = 1200, current_ansi = 1252; var current_codepage = 1200, current_ansi = 1252;
/*:: declare var cptable:any; */ /*:: declare var cptable:any; */
/*global cptable:true, window */ /*global cptable:true, window */
...@@ -15724,7 +15724,7 @@ function xlml_normalize(d)/*:string*/ { ...@@ -15724,7 +15724,7 @@ function xlml_normalize(d)/*:string*/ {
/* TODO: Everything */ /* TODO: Everything */
/* UOS uses CJK in tags */ /* UOS uses CJK in tags */
var xlmlregex = /<(\/?)([^\s?>!\/:]*:|)([^\s?>:\/]+)[^>]*>/mg; var xlmlregex = /<(\/?)([^\s?><!\/:]*:|)([^\s?<>:\/]+)(?:[\s?:\/][^>]*)?>/mg;
//var xlmlregex = /<(\/?)([a-z0-9]*:|)(\w+)[^>]*>/mg; //var xlmlregex = /<(\/?)([a-z0-9]*:|)(\w+)[^>]*>/mg;
function parse_xlml_xml(d, _opts)/*:Workbook*/ { function parse_xlml_xml(d, _opts)/*:Workbook*/ {
var opts = _opts || {}; var opts = _opts || {};
...@@ -21276,7 +21276,7 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet ...@@ -21276,7 +21276,7 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet
var _range = safe_decode_range(ws['!ref']); var _range = safe_decode_range(ws['!ref']);
range.e.c = Math.max(range.e.c, _range.e.c); range.e.c = Math.max(range.e.c, _range.e.c);
range.e.r = Math.max(range.e.r, _range.e.r); range.e.r = Math.max(range.e.r, _range.e.r);
if(_R == -1) { _R = range.e.r + 1; range.e.r = _R + js.length - 1 + offset; } if(_R == -1) { _R = _range.e.r + 1; range.e.r = _R + js.length - 1 + offset; }
} }
var hdr/*:Array<string>*/ = o.header || [], C = 0; var hdr/*:Array<string>*/ = o.header || [], C = 0;
......
此差异由.gitattributes 抑制。
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */ /*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
var XLSX = {}; var XLSX = {};
function make_xlsx_lib(XLSX){ function make_xlsx_lib(XLSX){
XLSX.version = '0.15.6'; XLSX.version = '0.16.0';
var current_codepage = 1200, current_ansi = 1252; var current_codepage = 1200, current_ansi = 1252;
var VALID_ANSI = [ 874, 932, 936, 949, 950 ]; var VALID_ANSI = [ 874, 932, 936, 949, 950 ];
...@@ -8472,7 +8472,7 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet ...@@ -8472,7 +8472,7 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array<any>*/, opts)/*:Worksheet
var _range = safe_decode_range(ws['!ref']); var _range = safe_decode_range(ws['!ref']);
range.e.c = Math.max(range.e.c, _range.e.c); range.e.c = Math.max(range.e.c, _range.e.c);
range.e.r = Math.max(range.e.r, _range.e.r); range.e.r = Math.max(range.e.r, _range.e.r);
if(_R == -1) { _R = range.e.r + 1; range.e.r = _R + js.length - 1 + offset; } if(_R == -1) { _R = _range.e.r + 1; range.e.r = _R + js.length - 1 + offset; }
} }
var hdr/*:Array<string>*/ = o.header || [], C = 0; var hdr/*:Array<string>*/ = o.header || [], C = 0;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */ /*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
var XLSX = {}; var XLSX = {};
function make_xlsx_lib(XLSX){ function make_xlsx_lib(XLSX){
XLSX.version = '0.15.6'; XLSX.version = '0.16.0';
var current_codepage = 1200, current_ansi = 1252; var current_codepage = 1200, current_ansi = 1252;
var VALID_ANSI = [ 874, 932, 936, 949, 950 ]; var VALID_ANSI = [ 874, 932, 936, 949, 950 ];
...@@ -8368,7 +8368,7 @@ function sheet_add_json(_ws, js, opts) { ...@@ -8368,7 +8368,7 @@ function sheet_add_json(_ws, js, opts) {
var _range = safe_decode_range(ws['!ref']); var _range = safe_decode_range(ws['!ref']);
range.e.c = Math.max(range.e.c, _range.e.c); range.e.c = Math.max(range.e.c, _range.e.c);
range.e.r = Math.max(range.e.r, _range.e.r); range.e.r = Math.max(range.e.r, _range.e.r);
if(_R == -1) { _R = range.e.r + 1; range.e.r = _R + js.length - 1 + offset; } if(_R == -1) { _R = _range.e.r + 1; range.e.r = _R + js.length - 1 + offset; }
} }
var hdr = o.header || [], C = 0; var hdr = o.header || [], C = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册