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(guild): fix nil panics causing clan menu softlock (#171)

Browse Source 
The crash was in handleMsgMhfGetGuildManageRight where a variable
shadowing bug (guild, err := instead of guild, err =) left the
outer guild pointer nil after the inner GetByID lookup succeeded,
panicking at guild.MemberCount. This is confirmed by the user's
stack trace pointing to handlers_guild.go:234.

Also fix 6 other nil-dereference risks across guild handlers:
- handleMsgMhfArrangeGuildMember: guild nil after GetByID
- handleMsgMhfEnumerateGuildMember: alliance nil when AllianceID > 0
- handleMsgMhfUpdateGuildIcon: guild and characterInfo nil
- handleMsgMhfOperateGuild: guild nil, characterGuildInfo nil
- handleAvoidLeadershipUpdate: characterGuildData nil

Improve panic recovery to log opcode and full stack trace so
future panics can be diagnosed from console screenshots.
This commit is contained in:
Houmgaor
2026-03-06 00:15:53 +01:00
parent 69ad4ca54a
commit bfc5319cb6
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/channelserver/handlers_guild.go
View File

@@ -41,7 +41,7 @@ func handleMsgMhfArrangeGuildMember(s *Session, p mhfpacket.MHFPacket) {
guild, err := s.server.guildRepo.GetByID(pkt.GuildID)
if err != nil {
if err != nil || guild == nil {
s.logger.Error(
"failed to respond to ArrangeGuildMember message",
zap.Uint32("charID", s.charID),
@@ -131,7 +131,7 @@ func handleMsgMhfEnumerateGuildMember(s *Session, p mhfpacket.MHFPacket) {
alliance, err := s.server.guildRepo.GetAllianceByID(guild.AllianceID)
if err != nil {
s.logger.Error("Failed to get alliance data")
s.logger.Error("Failed to get alliance data", zap.Error(err))
doAckBufFail(s, pkt.AckHandle, make([]byte, 4))
return
}
@@ -170,7 +170,7 @@ func handleMsgMhfEnumerateGuildMember(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint32(member.LastLogin)
}
if guild.AllianceID > 0 {
if guild.AllianceID > 0 && alliance != nil {
bf.WriteUint16(alliance.TotalMembers - uint16(len(guildMembers)))
if guild.ID != alliance.ParentGuildID {
mems, err := s.server.guildRepo.GetMembers(alliance.ParentGuildID, false)
@@ -222,7 +222,8 @@ func handleMsgMhfGetGuildManageRight(s *Session, p mhfpacket.MHFPacket) {
guild, _ := s.server.guildRepo.GetByCharID(s.charID)
if guild == nil || s.prevGuildID != 0 {
guild, err := s.server.guildRepo.GetByID(s.prevGuildID)
var err error
guild, err = s.server.guildRepo.GetByID(s.prevGuildID)
s.prevGuildID = 0
if guild == nil || err != nil {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
@@ -298,7 +299,7 @@ func handleMsgMhfUpdateGuildIcon(s *Session, p mhfpacket.MHFPacket) {
guild, err := s.server.guildRepo.GetByID(pkt.GuildID)
if err != nil {
if err != nil || guild == nil {
s.logger.Error("Failed to get guild info for icon update", zap.Error(err))
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
return
@@ -306,7 +307,7 @@ func handleMsgMhfUpdateGuildIcon(s *Session, p mhfpacket.MHFPacket) {
characterInfo, err := s.server.guildRepo.GetCharacterMembership(s.charID)
if err != nil {
if err != nil || characterInfo == nil {
s.logger.Error("Failed to get character guild data for icon update", zap.Error(err))
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
return