romein/go-fmp
1
0
Fork 0
mirror of https://github.com/garraflavatra/go-fmp.git synced 2025-07-17 03:34:05 +00:00
Code Issues Releases Activity

Store everything in uint64 to avoid overflow

Browse Source
This commit is contained in:
Romein van Buren
2025-06-12 11:52:09 +02:00
parent 8562e1147b
commit d715fe6e64
5 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
fmp/fmp_chunk.go
View File

@ -1,9 +1,5 @@
package fmp
import (
"encoding/binary"
)
func (ctx *FmpFile) readChunk(payload []byte) (*FmpChunk, error) {
// Simple data
@ -34,7 +30,7 @@ func (ctx *FmpFile) readChunk(payload []byte) (*FmpChunk, error) {
return &FmpChunk{
Type: FMP_CHUNK_SIMPLE_DATA,
Value: payload[1 : 1+length],
Length: 1 + uint32(length),
Length: 1 + uint64(length),
}, nil
}
if 0x12 <= payload[0] && payload[0] <= 0x15 {
@ -42,7 +38,7 @@ func (ctx *FmpFile) readChunk(payload []byte) (*FmpChunk, error) {
return &FmpChunk{
Type: FMP_CHUNK_SIMPLE_DATA,
Value: payload[1 : 1+length],
Length: 1 + uint32(length),
Length: 1 + uint64(length),
}, nil
}
if 0x1A <= payload[0] && payload[0] <= 0x1D {
@ -50,7 +46,7 @@ func (ctx *FmpFile) readChunk(payload []byte) (*FmpChunk, error) {
return &FmpChunk{
Type: FMP_CHUNK_SIMPLE_DATA,
Value: payload[1 : 1+length],
Length: 1 + uint32(length),
Length: 1 + uint64(length),
}, nil
}
@ -59,7 +55,7 @@ func (ctx *FmpFile) readChunk(payload []byte) (*FmpChunk, error) {
if payload[0] == 0x01 {
return &FmpChunk{
Type: FMP_CHUNK_SIMPLE_KEY_VALUE,
Key: uint32(payload[1]),
Key: uint64(payload[1]),
Value: payload[2 : 2+1],
Length: 3,
}, nil
@ -68,24 +64,24 @@ func (ctx *FmpFile) readChunk(payload []byte) (*FmpChunk, error) {
length := 2 * (payload[0] - 1)
return &FmpChunk{
Type: FMP_CHUNK_SIMPLE_KEY_VALUE,
Key: uint32(payload[1]),
Key: uint64(payload[1]),
Value: payload[2 : 2+length],
Length: 2 + uint32(length),
Length: 2 + uint64(length),
}, nil
}
if payload[0] == 0x06 {
length := payload[2]
return &FmpChunk{
Type: FMP_CHUNK_SIMPLE_KEY_VALUE,
Key: uint32(payload[1]),
Key: uint64(payload[1]),
Value: payload[3 : 3+length], // docs say offset 2?
Length: 3 + uint32(length),
Length: 3 + uint64(length),
}, nil
}
if payload[0] == 0x09 {
return &FmpChunk{
Type: FMP_CHUNK_SIMPLE_KEY_VALUE,
Key: uint32(binary.BigEndian.Uint16(payload[1:3])),
Key: parseVarUint64(payload[1:3]),
Value: payload[3 : 3+1], // docs say offset 2?
Length: 4,
}, nil
@ -94,18 +90,18 @@ func (ctx *FmpFile) readChunk(payload []byte) (*FmpChunk, error) {
length := 2 * (payload[0] - 9)
return &FmpChunk{
Type: FMP_CHUNK_SIMPLE_KEY_VALUE,
Key: uint32(binary.BigEndian.Uint16(payload[1:3])),
Key: parseVarUint64(payload[1:3]),
Value: payload[3 : 3+length], // docs say offset 2?
Length: 2 + uint32(length),
Length: 2 + uint64(length),
}, nil
}
if payload[0] == 0x0E {
length := payload[2]
return &FmpChunk{
Type: FMP_CHUNK_SIMPLE_KEY_VALUE,
Key: uint32(binary.BigEndian.Uint16(payload[1:3])),
Key: parseVarUint64(payload[1:3]),
Value: payload[4 : 4+length], // docs say offset 2?
Length: 4 + uint32(length),
Length: 4 + uint64(length),
}, nil
}
@ -115,18 +111,18 @@ func (ctx *FmpFile) readChunk(payload []byte) (*FmpChunk, error) {
length := payload[4]
return &FmpChunk{
Type: FMP_CHUNK_LONG_KEY_VALUE,
Key: parseVarUint32(payload[1 : 1+3]),
Key: parseVarUint64(payload[1 : 1+3]),
Value: payload[5 : 5+length],
Length: 5 + uint32(length),
Length: 5 + uint64(length),
}, nil
}
if payload[0] == 0x17 {
length := uint32(binary.BigEndian.Uint16(payload[4 : 4+2]))
length := parseVarUint64(payload[4 : 4+2])
return &FmpChunk{
Type: FMP_CHUNK_LONG_KEY_VALUE,
Key: uint32(binary.BigEndian.Uint16(payload[1 : 1+2])),
Key: parseVarUint64(payload[1 : 1+2]),
Value: payload[6 : 6+length],
Length: 6 + uint32(length),
Length: 6 + uint64(length),
}, nil
}
if payload[0] == 0x1E {
@ -134,40 +130,40 @@ func (ctx *FmpFile) readChunk(payload []byte) (*FmpChunk, error) {
valueLength := payload[2+keyLength]
return &FmpChunk{
Type: FMP_CHUNK_LONG_KEY_VALUE,
Key: parseVarUint32(payload[2 : 2+keyLength]),
Key: parseVarUint64(payload[2 : 2+keyLength]),
Value: payload[2+keyLength+1 : 2+keyLength+1+valueLength],
Length: 3 + uint32(keyLength) + uint32(valueLength),
Length: 3 + uint64(keyLength) + uint64(valueLength),
}, nil
}
if payload[0] == 0x1F {
keyLength := uint32(payload[1])
valueLength := parseVarUint32(payload[2+keyLength : 2+keyLength+2+1])
keyLength := uint64(payload[1])
valueLength := parseVarUint64(payload[2+keyLength : 2+keyLength+2+1])
return &FmpChunk{
Type: FMP_CHUNK_LONG_KEY_VALUE,
Key: parseVarUint32(payload[2 : 2+keyLength]),
Key: parseVarUint64(payload[2 : 2+keyLength]),
Value: payload[2+keyLength+2 : 2+keyLength+2+valueLength],
Length: 4 + uint32(keyLength) + uint32(valueLength),
Length: 4 + uint64(keyLength) + uint64(valueLength),
}, nil
}
// Segmented data
if payload[0] == 0x07 {
length := binary.BigEndian.Uint16(payload[2 : 2+2])
payloadLimit := min(4+length, uint16(len(payload)))
length := parseVarUint64(payload[2 : 2+2])
payloadLimit := min(4+length, uint64(len(payload)))
return &FmpChunk{
Type: FMP_CHUNK_SEGMENTED_DATA,
Index: uint32(payload[1]),
Index: uint64(payload[1]),
Value: payload[4:payloadLimit],
Length: 4 + uint32(length),
Length: 4 + uint64(length),
}, nil
}
if payload[0] == 0x0F {
length := uint32(binary.BigEndian.Uint16(payload[3 : 3+2]))
payloadLimit := min(5+length, uint32(len(payload)))
length := parseVarUint64(payload[3 : 3+2])
payloadLimit := min(5+length, uint64(len(payload)))
return &FmpChunk{
Type: FMP_CHUNK_SEGMENTED_DATA,
Index: uint32(binary.BigEndian.Uint16(payload[1 : 1+2])),
Index: parseVarUint64(payload[1 : 1+2]),
Value: payload[5:payloadLimit],
Length: 5 + length,
}, nil
@ -208,7 +204,7 @@ func (ctx *FmpFile) readChunk(payload []byte) (*FmpChunk, error) {
return &FmpChunk{
Type: FMP_CHUNK_PATH_PUSH,
Value: payload[2 : 2+length],
Length: 2 + uint32(length),
Length: 2 + uint64(length),
}, nil
}