Skip to content

Commit 7c19807

Browse files
SheetJSDevSheetJSDev
committed
version bump 1.1.4: detect sector cycle (fixes #8)
1 parent 6367acf commit 7c19807

16 files changed

+227
-17
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ accept a `name` argument strictly deal with absolute file names:
131131
Set the option `{unsafe:true}` to skip existence checks (for bulk additions)
132132
- `.cfb_del(cfb, name)` deletes the specified file
133133
- `.cfb_mov(cfb, old_name, new_name)` moves the old file to new path and name
134-
- `.use_zlib(require("zlib"))` loads a nodejs zlib instance.
134+
- `.use_zlib(require("zlib"))` loads a nodejs `zlib` instance.
135135

136136
By default, the library uses a pure JS inflate/deflate implementation. NodeJS
137137
`zlib.InflateRaw` exposes the number of bytes read in versions after `8.11.0`.
@@ -169,7 +169,7 @@ granted by the Apache 2.0 License are reserved by the Original Author.
169169

170170
## References
171171

172-
- [MS-CFB]: Compound File Binary File Format
173-
- ZIP `APPNOTE.TXT`: https://pkware.cachefly.net/webdocs/APPNOTE/APPNOTE-6.3.4.TXT
172+
- `MS-CFB`: Compound File Binary File Format
173+
- ZIP `APPNOTE.TXT`: .ZIP File Format Specification
174174
- RFC1951: https://www.ietf.org/rfc/rfc1951.txt
175175

‎bits/31_version.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
exports.version = '1.1.3';
1+
exports.version = '1.1.4';

‎bits/45_readfat.js

+3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ function make_sector_list(sectors/*:Array<RawBytes>*/, dir_start/*:number*/, fat
4343
k = (i + dir_start); if(k >= sl) k-=sl;
4444
if(chkd[k]) continue;
4545
buf_chain = [];
46+
var seen = [];
4647
for(j=k; j>=0;) {
48+
seen[j] = true;
4749
chkd[j] = true;
4850
buf[buf.length] = j;
4951
buf_chain.push(sectors[j]);
@@ -52,6 +54,7 @@ function make_sector_list(sectors/*:Array<RawBytes>*/, dir_start/*:number*/, fat
5254
if(ssz < 4 + jj) throw new Error("FAT boundary crossed: " + j + " 4 "+ssz);
5355
if(!sectors[addr]) break;
5456
j = __readInt32LE(sectors[addr], jj);
57+
if(seen[j]) break;
5558
}
5659
sector_list[k] = ({nodes: buf, data:__toBuffer([buf_chain])}/*:SectorEntry*/);
5760
}

‎cfb.flow.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ CRC32.str = crc32_str;
295295
/* [MS-CFB] v20171201 */
296296
var CFB = (function _CFB(){
297297
var exports/*:CFBModule*/ = /*::(*/{}/*:: :any)*/;
298-
exports.version = '1.1.3';
298+
exports.version = '1.1.4';
299299
/* [MS-CFB] 2.6.4 */
300300
function namecmp(l/*:string*/, r/*:string*/)/*:number*/ {
301301
var L = l.split("/"), R = r.split("/");
@@ -626,7 +626,9 @@ function make_sector_list(sectors/*:Array<RawBytes>*/, dir_start/*:number*/, fat
626626
k = (i + dir_start); if(k >= sl) k-=sl;
627627
if(chkd[k]) continue;
628628
buf_chain = [];
629+
var seen = [];
629630
for(j=k; j>=0;) {
631+
seen[j] = true;
630632
chkd[j] = true;
631633
buf[buf.length] = j;
632634
buf_chain.push(sectors[j]);
@@ -635,6 +637,7 @@ function make_sector_list(sectors/*:Array<RawBytes>*/, dir_start/*:number*/, fat
635637
if(ssz < 4 + jj) throw new Error("FAT boundary crossed: " + j + " 4 "+ssz);
636638
if(!sectors[addr]) break;
637639
j = __readInt32LE(sectors[addr], jj);
640+
if(seen[j]) break;
638641
}
639642
sector_list[k] = ({nodes: buf, data:__toBuffer([buf_chain])}/*:SectorEntry*/);
640643
}

‎cfb.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ CRC32.str = crc32_str;
277277
/* [MS-CFB] v20171201 */
278278
var CFB = (function _CFB(){
279279
var exports = {};
280-
exports.version = '1.1.3';
280+
exports.version = '1.1.4';
281281
/* [MS-CFB] 2.6.4 */
282282
function namecmp(l, r) {
283283
var L = l.split("/"), R = r.split("/");
@@ -608,7 +608,9 @@ function make_sector_list(sectors, dir_start, fat_addrs, ssz) {
608608
k = (i + dir_start); if(k >= sl) k-=sl;
609609
if(chkd[k]) continue;
610610
buf_chain = [];
611+
var seen = [];
611612
for(j=k; j>=0;) {
613+
seen[j] = true;
612614
chkd[j] = true;
613615
buf[buf.length] = j;
614616
buf_chain.push(sectors[j]);
@@ -617,6 +619,7 @@ function make_sector_list(sectors, dir_start, fat_addrs, ssz) {
617619
if(ssz < 4 + jj) throw new Error("FAT boundary crossed: " + j + " 4 "+ssz);
618620
if(!sectors[addr]) break;
619621
j = __readInt32LE(sectors[addr], jj);
622+
if(seen[j]) break;
620623
}
621624
sector_list[k] = ({nodes: buf, data:__toBuffer([buf_chain])});
622625
}

‎dist/LICENSE

+189-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,192 @@
1-
Copyright (C) 2013-present SheetJS
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "{}"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright (C) 2013-present SheetJS LLC
2190

3191
Licensed under the Apache License, Version 2.0 (the "License");
4192
you may not use this file except in compliance with the License.

‎dist/cfb.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ CRC32.str = crc32_str;
277277
/* [MS-CFB] v20171201 */
278278
var CFB = (function _CFB(){
279279
var exports = {};
280-
exports.version = '1.1.3';
280+
exports.version = '1.1.4';
281281
/* [MS-CFB] 2.6.4 */
282282
function namecmp(l, r) {
283283
var L = l.split("/"), R = r.split("/");
@@ -608,7 +608,9 @@ function make_sector_list(sectors, dir_start, fat_addrs, ssz) {
608608
k = (i + dir_start); if(k >= sl) k-=sl;
609609
if(chkd[k]) continue;
610610
buf_chain = [];
611+
var seen = [];
611612
for(j=k; j>=0;) {
613+
seen[j] = true;
612614
chkd[j] = true;
613615
buf[buf.length] = j;
614616
buf_chain.push(sectors[j]);
@@ -617,6 +619,7 @@ function make_sector_list(sectors, dir_start, fat_addrs, ssz) {
617619
if(ssz < 4 + jj) throw new Error("FAT boundary crossed: " + j + " 4 "+ssz);
618620
if(!sectors[addr]) break;
619621
j = __readInt32LE(sectors[addr], jj);
622+
if(seen[j]) break;
620623
}
621624
sector_list[k] = ({nodes: buf, data:__toBuffer([buf_chain])});
622625
}

‎dist/cfb.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/cfb.min.map

+1-1
Large diffs are not rendered by default.

‎dist/xlscfb.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ CRC32.str = crc32_str;
142142
/* [MS-CFB] v20171201 */
143143
var CFB = (function _CFB(){
144144
var exports/*:CFBModule*/ = /*::(*/{}/*:: :any)*/;
145-
exports.version = '1.1.3';
145+
exports.version = '1.1.4';
146146
/* [MS-CFB] 2.6.4 */
147147
function namecmp(l/*:string*/, r/*:string*/)/*:number*/ {
148148
var L = l.split("/"), R = r.split("/");
@@ -473,7 +473,9 @@ function make_sector_list(sectors/*:Array<RawBytes>*/, dir_start/*:number*/, fat
473473
k = (i + dir_start); if(k >= sl) k-=sl;
474474
if(chkd[k]) continue;
475475
buf_chain = [];
476+
var seen = [];
476477
for(j=k; j>=0;) {
478+
seen[j] = true;
477479
chkd[j] = true;
478480
buf[buf.length] = j;
479481
buf_chain.push(sectors[j]);
@@ -482,6 +484,7 @@ function make_sector_list(sectors/*:Array<RawBytes>*/, dir_start/*:number*/, fat
482484
if(ssz < 4 + jj) throw new Error("FAT boundary crossed: " + j + " 4 "+ssz);
483485
if(!sectors[addr]) break;
484486
j = __readInt32LE(sectors[addr], jj);
487+
if(seen[j]) break;
485488
}
486489
sector_list[k] = ({nodes: buf, data:__toBuffer([buf_chain])}/*:SectorEntry*/);
487490
}

‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<script>
4747
/*jshint browser:true */
4848
/* eslint-env browser */
49-
/*global Uint8Array, ArrayBuffer, console, alert */
49+
/*global Uint8Array, ArrayBuffer */
5050
/*global CFB, out, PRINTJ, saveAs */
5151
/* exported savefile, download_file */
5252
/* eslint no-use-before-define:0 */

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cfb",
3-
"version": "1.1.3",
3+
"version": "1.1.4",
44
"author": "sheetjs",
55
"description": "Compound File Binary File Format extractor",
66
"keywords": [

‎test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,8 @@ describe('output formats', function() {
213213
if(typeof r[1] != "string") throw new Error(r[0] + " binary write failed");
214214
var good = false;
215215
for(var i = 0; i < r[1].length; ++i) {
216-
if(r[1].charCodeAt(i) == 0x00) good = true;
217-
else if(r[1].charCodeAt(i) > 0xFF) { good = false; break; }
216+
if(/*::((*/r[1]/*:: :any):string)*/.charCodeAt(i) == 0x00) good = true;
217+
else if(/*::((*/r[1]/*:: :any):string)*/.charCodeAt(i) > 0xFF) { good = false; break; }
218218
}
219219
if(!good) throw new Error(r[0] + " binary write failed");
220220
});

‎types/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"paths": { "cfb": ["."] },
1010
"types": [],
1111
"noEmit": true,
12+
"strictFunctionTypes": true,
1213
"forceConsistentCasingInFileNames": true
1314
}
1415
}

0 commit comments

Comments
 (0)