wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-11-28 03:02:55 +03:00
Code Issues Projects Releases Wiki Activity

zip: Assert signature not validate

Browse Source
This commit is contained in:
Mattias Wadman 2022-01-22 16:26:03 +01:00
parent b700194ac7
commit 778a1a4178
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
format/zip/zip.go
View File

@ -2,6 +2,7 @@ package zip
// https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT // https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
// https://opensource.apple.com/source/zip/zip-6/unzip/unzip/proginfo/extra.fld // https://opensource.apple.com/source/zip/zip-6/unzip/unzip/proginfo/extra.fld
// TODO: zip64
import ( import (
"bytes" "bytes"
@ -151,7 +152,7 @@ func zipDecode(d *decode.D, in interface{}) interface{} {
var diskNr uint64 var diskNr uint64
d.FieldStruct("end_of_central_directory", func(d *decode.D) { d.FieldStruct("end_of_central_directory", func(d *decode.D) {
d.FieldRawLen("signature", 4*8, d.ValidateBitBuf(endOfCentralDirectorySignature)) d.FieldRawLen("signature", 4*8, d.AssertBitBuf(endOfCentralDirectorySignature))
diskNr = d.FieldU16("disk_nr") diskNr = d.FieldU16("disk_nr")
d.FieldU16("central_directory_start_disk_nr") d.FieldU16("central_directory_start_disk_nr")
d.FieldU16("nr_of_central_directory_records_on_disk") d.FieldU16("nr_of_central_directory_records_on_disk")
@ -169,7 +170,7 @@ func zipDecode(d *decode.D, in interface{}) interface{} {
d.LenFn(int64(sizeCD)*8, func(d *decode.D) { d.LenFn(int64(sizeCD)*8, func(d *decode.D) {
for !d.End() { for !d.End() {
d.FieldStruct("central_directory", func(d *decode.D) { d.FieldStruct("central_directory", func(d *decode.D) {
d.FieldRawLen("signature", 4*8, d.ValidateBitBuf(centralDirectorySignature)) d.FieldRawLen("signature", 4*8, d.AssertBitBuf(centralDirectorySignature))
d.FieldU16("version_made_by") d.FieldU16("version_made_by")
d.FieldU16("version_needed") d.FieldU16("version_needed")
d.FieldStruct("flags", func(d *decode.D) { d.FieldStruct("flags", func(d *decode.D) {
@ -229,7 +230,7 @@ func zipDecode(d *decode.D, in interface{}) interface{} {
d.SeekAbs(int64(o) * 8) d.SeekAbs(int64(o) * 8)
d.FieldStruct("local_file", func(d *decode.D) { d.FieldStruct("local_file", func(d *decode.D) {
var hasDataDescriptor bool var hasDataDescriptor bool
d.FieldRawLen("signature", 4*8, d.ValidateBitBuf(localFileSignature)) d.FieldRawLen("signature", 4*8, d.AssertBitBuf(localFileSignature))
d.FieldU16("version_needed") d.FieldU16("version_needed")
d.FieldStruct("flags", func(d *decode.D) { d.FieldStruct("flags", func(d *decode.D) {
// TODO: 16LE, should have some kind of native endian flag reader helper? // TODO: 16LE, should have some kind of native endian flag reader helper?
@ -311,7 +312,7 @@ func zipDecode(d *decode.D, in interface{}) interface{} {
if hasDataDescriptor { if hasDataDescriptor {
d.FieldStruct("data_indicator", func(d *decode.D) { d.FieldStruct("data_indicator", func(d *decode.D) {
if bytes.Equal(d.PeekBytes(4), dataIndicatorSignature) { if bytes.Equal(d.PeekBytes(4), dataIndicatorSignature) {
d.FieldRawLen("signature", 4*8, d.ValidateBitBuf(dataIndicatorSignature)) d.FieldRawLen("signature", 4*8, d.AssertBitBuf(dataIndicatorSignature))
} }
d.FieldU32("crc32_uncompressed", scalar.Hex) d.FieldU32("crc32_uncompressed", scalar.Hex)
d.FieldU32("compressed_size") d.FieldU32("compressed_size")