From 1a8e6327342fc6a8f8a35d75590a0c25638576ae Mon Sep 17 00:00:00 2001 From: chennqqi Date: Wed, 7 Jun 2023 18:25:21 +0800 Subject: [PATCH 01/13] Create LICENSE --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From f109db1faf7caa5bcdd774d5210c8583d8056c3d Mon Sep 17 00:00:00 2001 From: chennqqi Date: Wed, 7 Jun 2023 18:36:30 +0800 Subject: [PATCH 02/13] fix panic --- sector_reader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sector_reader.go b/sector_reader.go index 2bc8369..9f0aba1 100644 --- a/sector_reader.go +++ b/sector_reader.go @@ -13,7 +13,7 @@ type SectorReader struct { } func newSectorReader(r io.ReaderAt, sectorSize, startSector uint32, fat []uint32, offsetResolver func(uint32) int64) (*SectorReader, error) { - if startSector < 0 { + if int32(startSector) < 0 { return nil, ErrWrongSector } else if s := fat[startSector]; s > maxRegSect && s != endOfChain { return nil, ErrInvalidSectorChain From e64e9d754f9e09ba53c0b00fe62bc32c735e7df4 Mon Sep 17 00:00:00 2001 From: chennqqi Date: Sun, 25 Jun 2023 10:40:57 +0800 Subject: [PATCH 03/13] fix index out of range --- sector_reader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sector_reader.go b/sector_reader.go index 9f0aba1..ab1fdaa 100644 --- a/sector_reader.go +++ b/sector_reader.go @@ -21,7 +21,7 @@ func newSectorReader(r io.ReaderAt, sectorSize, startSector uint32, fat []uint32 var sectors []uint32 s := startSector - for s != endOfChain { + for s != endOfChain && s < len(fat) { sectors = append(sectors, s) s = fat[s] } From c295f490afdab21e0dbf27d703e1ad4af48a2ebf Mon Sep 17 00:00:00 2001 From: chennqqi Date: Sun, 25 Jun 2023 10:45:04 +0800 Subject: [PATCH 04/13] add mod && fix build --- go.mod | 3 +++ sector_reader.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 go.mod diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..5ad64a5 --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module github.com/chennqqi/cfb + +go 1.20 diff --git a/sector_reader.go b/sector_reader.go index ab1fdaa..2b0aeb6 100644 --- a/sector_reader.go +++ b/sector_reader.go @@ -21,7 +21,7 @@ func newSectorReader(r io.ReaderAt, sectorSize, startSector uint32, fat []uint32 var sectors []uint32 s := startSector - for s != endOfChain && s < len(fat) { + for s != endOfChain && int(s) < len(fat) && s >= 0 { sectors = append(sectors, s) s = fat[s] } From 61ed00341ed61931f0a3de6e59eeffacb9fd87f5 Mon Sep 17 00:00:00 2001 From: chennqqi Date: Sun, 25 Jun 2023 10:59:07 +0800 Subject: [PATCH 05/13] fix index out of range [0] with length 0 --- file.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/file.go b/file.go index f6bc62a..af2b974 100644 --- a/file.go +++ b/file.go @@ -176,7 +176,9 @@ func (f *File) buildDirectoryTree() error { d.path = ps walk(d.raw.ChildID, d, ps) } - walk(ds[0].raw.ChildID, ds[0], []string{}) + if len(ds) > 0 { + walk(ds[0].raw.ChildID, ds[0], []string{}) + } f.directoryEntries = ds return nil From fb1f9f371b9604e3f9dc81e36a3023e3a75d03ea Mon Sep 17 00:00:00 2001 From: chennqqi Date: Sun, 25 Jun 2023 11:10:16 +0800 Subject: [PATCH 06/13] fix panic: slice bounds out of range [1:0] --- file.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/file.go b/file.go index af2b974..88c5c98 100644 --- a/file.go +++ b/file.go @@ -39,12 +39,14 @@ func (f *File) Header() *FileHeader { func (f *File) Objects() ([]Object, error) { var os []Object - for _, d := range f.directoryEntries[1:] { - o, err := d.object() - if err != nil { - return nil, err + if len(f.directoryEntries) > 1 { + for _, d := range f.directoryEntries[1:] { + o, err := d.object() + if err != nil { + return nil, err + } + os = append(os, o) } - os = append(os, o) } return os, nil } From f8e8fa82d612d54b1fb953992096ce1a6f4ef35f Mon Sep 17 00:00:00 2001 From: chennqqi Date: Tue, 27 Jun 2023 15:31:18 +0800 Subject: [PATCH 07/13] fix crash: panic: runtime error: slice bounds out of range [:159] with length 109 [recovered] --- file.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/file.go b/file.go index 88c5c98..47f4d2e 100644 --- a/file.go +++ b/file.go @@ -74,9 +74,18 @@ func (f *File) Get(path string) (Object, error) { return d.object() } +func minUint32(v1, v2 uint32) uint32 { + if v1 < v2 { + return v1 + } + return v2 +} + func (f *File) buildFAT() error { - sectors := make([]uint32, f.header.raw.NumberOfFATSectors) - copy(sectors, f.header.raw.DIFAT[:f.header.raw.NumberOfFATSectors]) + // https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-cfb/05060311-bfce-4b12-874d-71fd4ce63aea + minSections := minUint32(f.header.raw.NumberOfFATSectors, uint32(len(f.header.raw.DIFAT))) + sectors := make([]uint32, minSections) + copy(sectors, f.header.raw.DIFAT[:minSections]) if f.header.raw.NumberOfDIFATSectors > 0 { s := f.header.raw.FirstDIFATSectorLocation From c7a671b88579dd56276289db8c75ce4904bec0ea Mon Sep 17 00:00:00 2001 From: chennqqi Date: Thu, 29 Jun 2023 17:23:17 +0800 Subject: [PATCH 08/13] fix crash --- file.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/file.go b/file.go index 47f4d2e..9e788dc 100644 --- a/file.go +++ b/file.go @@ -175,6 +175,9 @@ func (f *File) buildDirectoryTree() error { if id == noStream { return } + if uint32(len(ds)) < id { + return + } d := ds[id] parent.children = append(parent.children, d) From d220e12e90dac560736cf601eaca62df37ab8379 Mon Sep 17 00:00:00 2001 From: chennqqi Date: Thu, 29 Jun 2023 17:34:07 +0800 Subject: [PATCH 09/13] fix index --- file.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file.go b/file.go index 9e788dc..2099324 100644 --- a/file.go +++ b/file.go @@ -175,7 +175,7 @@ func (f *File) buildDirectoryTree() error { if id == noStream { return } - if uint32(len(ds)) < id { + if uint32(len(ds)) =< id { return } d := ds[id] From e8c3c7fb16cea3ea26f6ab88c21695511559d020 Mon Sep 17 00:00:00 2001 From: chennqqi Date: Thu, 29 Jun 2023 17:34:50 +0800 Subject: [PATCH 10/13] fix build --- file.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file.go b/file.go index 2099324..62587ca 100644 --- a/file.go +++ b/file.go @@ -175,7 +175,7 @@ func (f *File) buildDirectoryTree() error { if id == noStream { return } - if uint32(len(ds)) =< id { + if uint32(len(ds)) <= id { return } d := ds[id] From a87362b646b2b5d8a8dd79bb1d1d5fd4e05317ad Mon Sep 17 00:00:00 2001 From: chennqqi Date: Fri, 21 Jul 2023 19:46:31 +0800 Subject: [PATCH 11/13] fix OOM --- sector_reader.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sector_reader.go b/sector_reader.go index 2b0aeb6..ffedba9 100644 --- a/sector_reader.go +++ b/sector_reader.go @@ -1,6 +1,9 @@ package cfb -import "io" +import ( + "fmt" + "io" +) type SectorReader struct { r io.ReaderAt @@ -21,7 +24,8 @@ func newSectorReader(r io.ReaderAt, sectorSize, startSector uint32, fat []uint32 var sectors []uint32 s := startSector - for s != endOfChain && int(s) < len(fat) && s >= 0 { + for i := 0; s != endOfChain && int(s) < len(fat) && s >= 0 && i < len(fat); i++ { + fmt.Println("S=", s, len(fat), sectorSize) sectors = append(sectors, s) s = fat[s] } From 391fa70339709b0614d6903fca3fffb3c6e31020 Mon Sep 17 00:00:00 2001 From: chennqqi Date: Fri, 21 Jul 2023 20:31:17 +0800 Subject: [PATCH 12/13] remove log --- sector_reader.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/sector_reader.go b/sector_reader.go index ffedba9..d36c23c 100644 --- a/sector_reader.go +++ b/sector_reader.go @@ -1,7 +1,6 @@ package cfb import ( - "fmt" "io" ) @@ -25,7 +24,6 @@ func newSectorReader(r io.ReaderAt, sectorSize, startSector uint32, fat []uint32 var sectors []uint32 s := startSector for i := 0; s != endOfChain && int(s) < len(fat) && s >= 0 && i < len(fat); i++ { - fmt.Println("S=", s, len(fat), sectorSize) sectors = append(sectors, s) s = fat[s] } From b8422ec23264da32ef40fcb405cd8362afdb81d4 Mon Sep 17 00:00:00 2001 From: chennqqi Date: Tue, 26 Mar 2024 21:55:06 +0800 Subject: [PATCH 13/13] fix infinity loop --- directory_entry.go | 2 ++ file.go | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/directory_entry.go b/directory_entry.go index 5292471..f4d3fff 100644 --- a/directory_entry.go +++ b/directory_entry.go @@ -54,6 +54,8 @@ func (d *DirectoryEntry) Name() string { if d.raw.DirectoryEntryNameLength < 2 { return "" } + // fmt.Println("name len =", len(d.raw.DirectoryEntryName)) + // fmt.Println("name DirectoryEntryNameLength =", d.raw.DirectoryEntryNameLength) return decodeUTF16String(d.raw.DirectoryEntryName[:d.raw.DirectoryEntryNameLength-2]) } diff --git a/file.go b/file.go index 62587ca..5522f8b 100644 --- a/file.go +++ b/file.go @@ -1,6 +1,7 @@ package cfb import ( + // "fmt" "io" "io/ioutil" "strings" @@ -169,15 +170,29 @@ func (f *File) buildDirectoryTree() error { if err != nil { return err } - + // fmt.Println("total directoies", len(ds)) + const maxLoop = 20000 + idMap := make(map[uint32]bool) var walk func(uint32, *DirectoryEntry, []string) walk = func(id uint32, parent *DirectoryEntry, prefixes []string) { + // fmt.Println("walk id =", id, "pid = ", parent.id, len(prefixes)) + // fmt.Println("walk id = ", id, noStream) if id == noStream { return } if uint32(len(ds)) <= id { return } + if idMap[id] { + // fmt.Println("ID exists") + return + } + if len(idMap) > maxLoop { + return + } + + idMap[id] = true + d := ds[id] parent.children = append(parent.children, d)