jwetzell/osc-go
1
0
Fork 0
mirror of https://github.com/jwetzell/osc-go.git synced 2026-07-26 10:28:42 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge pull request #24 from jwetzell/fix/float-64-arg-size-check

Browse Source 
fix size check on readOSCFloat64
This commit is contained in:
Joel Wetzell
2026-05-20 17:39:59 -05:00
committed by GitHub
parent 82e9c7ed24 8ed1ab065c
commit f7850ce70e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osc.go
+8 -1
View File
@@ -247,7 +247,7 @@ func readOSCFloat32(bytes []byte) (float32, []byte, error) {
} }
func readOSCFloat64(bytes []byte) (float64, []byte, error) { func readOSCFloat64(bytes []byte) (float64, []byte, error) {
if len(bytes) < 4 { if len(bytes) < 8 {
return 0, bytes, errors.New("OSC float64 arg is not 8 bytes") return 0, bytes, errors.New("OSC float64 arg is not 8 bytes")
} }
bits := binary.BigEndian.Uint64(bytes[0:8]) bits := binary.BigEndian.Uint64(bytes[0:8])
@@ -261,6 +261,10 @@ func readOSCBlob(bytes []byte) ([]byte, []byte, error) {
return []byte{}, bytes, errors.New("OSC blob arg size not valid: " + err.Error()) return []byte{}, bytes, errors.New("OSC blob arg size not valid: " + err.Error())
} }
if blobLength < 0 {
return []byte{}, bytes, errors.New("OSC blob arg size not valid: size cannot be negative")
}
if len(remainingBytes) < int(blobLength) { if len(remainingBytes) < int(blobLength) {
return []byte{}, bytes, errors.New("OSC blob arg size not valid: size specified is larger than remaining bytes") return []byte{}, bytes, errors.New("OSC blob arg size not valid: size specified is larger than remaining bytes")
} }
@@ -271,6 +275,9 @@ func readOSCBlob(bytes []byte) ([]byte, []byte, error) {
if blobLengthPadding < 4 { if blobLengthPadding < 4 {
blobEnd = blobEnd + blobLengthPadding blobEnd = blobEnd + blobLengthPadding
} }
if int(blobEnd) > len(bytes) {
return []byte{}, bytes, errors.New("OSC blob arg size not valid: size specified is larger than remaining bytes when accounting for padding")
}
return bytes[4 : 4+blobLength], bytes[blobEnd:], nil return bytes[4 : 4+blobLength], bytes[blobEnd:], nil
} }