idk/go-i2p
1
0
Fork 0
mirror of https://github.com/go-i2p/go-i2p.git synced 2025-07-01 20:20:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed func(str I2pString) Length()

Browse Source 
-Previously incorrectly checked length causing TestI2PStringReportsExtraDataError to fail
This commit is contained in:
Haris Khan
2024-11-17 10:35:22 -05:00
parent 1d90db3239
commit 62ececf102
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/common/data/string.go
View File

@ -46,14 +46,8 @@ func (str I2PString) Length() (length int, err error) {
} }
length = l.Int() length = l.Int()
str_len := len(str) str_len := len(str)
if length > str_len {
/*log.WithFields(log.Fields{ if length > (str_len - 1) {
"at": "(I2PString) Length",
"string_bytes_length": str_len,
"string_length_field": length,
"data": string(str),
"reason": "data less than specified by length",
}).Error("string format warning")*/
log.WithFields(logrus.Fields{ log.WithFields(logrus.Fields{
"at": "(I2PString) Length", "at": "(I2PString) Length",
"string_bytes_length": str_len, "string_bytes_length": str_len,
@ -62,6 +56,17 @@ func (str I2PString) Length() (length int, err error) {
}).Warn("string format warning") }).Warn("string format warning")
err = errors.New("string parsing warning: string data is shorter than specified by length") err = errors.New("string parsing warning: string data is shorter than specified by length")
} }
if (str_len - 1) > length {
log.WithFields(logrus.Fields{
"at": "(I2PString) Length",
"string_bytes_length": str_len,
"string_length_field": length,
"reason": "data contains extra bytes beyond specified length",
}).Warn("string format warning")
err = errors.New("string parsing warning: string contains data beyond length")
}
return return
} }