Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-22 07:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: log SJIS decoding errors instead of silently discarding them

Browse Source 
Add SJISToUTF8Lossy() that wraps SJISToUTF8() and logs decode errors at
slog.Debug level. Replace all 31 call sites across 17 files that previously
discarded the error with `_, _ =`. This makes garbled text from malformed
SJIS client data debuggable without adding noise at default log levels.
This commit is contained in:
Houmgaor
2026-02-22 17:01:22 +01:00
parent 59fd722d37
commit f640cfee27
20 changed files with 63 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
network/mhfpacket/msg_mhf_apply_bbs_article.go
View File

@@ -30,9 +30,9 @@ func (m *MsgMhfApplyBbsArticle) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cl
m.AckHandle = bf.ReadUint32()
m.Unk0 = bf.ReadUint32()
m.Unk1 = bf.ReadBytes(16)
m.Name, _ = stringsupport.SJISToUTF8(bfutil.UpToNull(bf.ReadBytes(32)))
m.Title, _ = stringsupport.SJISToUTF8(bfutil.UpToNull(bf.ReadBytes(128)))
m.Description, _ = stringsupport.SJISToUTF8(bfutil.UpToNull(bf.ReadBytes(256)))
m.Name = stringsupport.SJISToUTF8Lossy(bfutil.UpToNull(bf.ReadBytes(32)))
m.Title = stringsupport.SJISToUTF8Lossy(bfutil.UpToNull(bf.ReadBytes(128)))
m.Description = stringsupport.SJISToUTF8Lossy(bfutil.UpToNull(bf.ReadBytes(256)))
return nil
}

2
network/mhfpacket/msg_mhf_create_guild.go
View File

@@ -25,7 +25,7 @@ func (m *MsgMhfCreateGuild) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Client
m.AckHandle = bf.ReadUint32()
bf.ReadUint16() // Zeroed
bf.ReadUint16() // Name length
m.Name, _ = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
m.Name = stringsupport.SJISToUTF8Lossy(bf.ReadNullTerminatedBytes())
return nil
}

2
network/mhfpacket/msg_mhf_create_joint.go
View File

@@ -27,7 +27,7 @@ func (m *MsgMhfCreateJoint) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Client
m.GuildID = bf.ReadUint32()
bf.ReadUint16() // Zeroed
bf.ReadUint16() // Name length
m.Name, _ = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
m.Name = stringsupport.SJISToUTF8Lossy(bf.ReadNullTerminatedBytes())
return nil
}

2
network/mhfpacket/msg_mhf_enumerate_house.go
View File

@@ -30,7 +30,7 @@ func (m *MsgMhfEnumerateHouse) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cli
bf.ReadUint16() // Zeroed
lenName := bf.ReadUint8()
if lenName > 0 {
m.Name, _ = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
m.Name = stringsupport.SJISToUTF8Lossy(bf.ReadNullTerminatedBytes())
}
return nil
}

2
network/mhfpacket/msg_mhf_load_house.go
View File

@@ -32,7 +32,7 @@ func (m *MsgMhfLoadHouse) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientCo
m.CheckPass = bf.ReadBool()
bf.ReadUint16() // Zeroed
bf.ReadUint8() // Password length
m.Password, _ = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
m.Password = stringsupport.SJISToUTF8Lossy(bf.ReadNullTerminatedBytes())
return nil
}

2
network/mhfpacket/msg_mhf_operate_warehouse.go
View File

@@ -32,7 +32,7 @@ func (m *MsgMhfOperateWarehouse) Parse(bf *byteframe.ByteFrame, ctx *clientctx.C
lenName := bf.ReadUint8()
bf.ReadUint16() // Zeroed
if lenName > 0 {
m.Name, _ = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
m.Name = stringsupport.SJISToUTF8Lossy(bf.ReadNullTerminatedBytes())
}
return nil
}

4
network/mhfpacket/msg_mhf_send_mail.go
View File

@@ -35,8 +35,8 @@ func (m *MsgMhfSendMail) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientCon
bf.ReadUint16() // Zeroed
m.Quantity = bf.ReadUint16()
m.ItemID = bf.ReadUint16()
m.Subject, _ = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
m.Body, _ = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
m.Subject = stringsupport.SJISToUTF8Lossy(bf.ReadNullTerminatedBytes())
m.Body = stringsupport.SJISToUTF8Lossy(bf.ReadNullTerminatedBytes())
return nil
}

8
network/mhfpacket/msg_mhf_update_guild_message_board.go
View File

@@ -38,8 +38,8 @@ func (m *MsgMhfUpdateGuildMessageBoard) Parse(bf *byteframe.ByteFrame, ctx *clie
m.StampID = bf.ReadUint32()
m.TitleLength = bf.ReadUint32()
m.BodyLength = bf.ReadUint32()
m.Title, _ = stringsupport.SJISToUTF8(bf.ReadBytes(uint(m.TitleLength)))
m.Body, _ = stringsupport.SJISToUTF8(bf.ReadBytes(uint(m.BodyLength)))
m.Title = stringsupport.SJISToUTF8Lossy(bf.ReadBytes(uint(m.TitleLength)))
m.Body = stringsupport.SJISToUTF8Lossy(bf.ReadBytes(uint(m.BodyLength)))
case 1:
m.PostID = bf.ReadUint32()
case 2:
@@ -47,8 +47,8 @@ func (m *MsgMhfUpdateGuildMessageBoard) Parse(bf *byteframe.ByteFrame, ctx *clie
bf.ReadBytes(8)
m.TitleLength = bf.ReadUint32()
m.BodyLength = bf.ReadUint32()
m.Title, _ = stringsupport.SJISToUTF8(bf.ReadBytes(uint(m.TitleLength)))
m.Body, _ = stringsupport.SJISToUTF8(bf.ReadBytes(uint(m.BodyLength)))
m.Title = stringsupport.SJISToUTF8Lossy(bf.ReadBytes(uint(m.TitleLength)))
m.Body = stringsupport.SJISToUTF8Lossy(bf.ReadBytes(uint(m.BodyLength)))
case 3:
m.PostID = bf.ReadUint32()
bf.ReadBytes(8)

2
network/mhfpacket/msg_mhf_update_house.go
View File

@@ -30,7 +30,7 @@ func (m *MsgMhfUpdateHouse) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Client
bf.ReadUint8() // Zeroed
bf.ReadUint8() // Zeroed
bf.ReadUint8() // Password length
m.Password, _ = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
m.Password = stringsupport.SJISToUTF8Lossy(bf.ReadNullTerminatedBytes())
return nil
}