Skip to content

fix(manager): fix initialization order to prevent nil pointer panic #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiuzhiqian merged 1 commit into from
May 20, 2026
Merged

fix(manager): fix initialization order to prevent nil pointer panic #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/lastore-daemon/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ func main() {
logger.Error("failed to new server manager and updater object:", err)
return
}
manager.initAgent()
manager.initPlatformManager()
if config.IntranetUpdate {
//不再依赖检查更新或者online定时器触发，而是直接创建
Expand Down
10 changes: 10 additions & 0 deletions src/lastore-daemon/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ func NewManager(service *dbusutil.Service, updateApi system.System, c *config.Co
go func() {
m.setPropHardwareId(updateplatform.GetHardwareId(m.config.IncludeDiskInfo, m.config.GetHardwareIdByHelper))
}()
m.initAgent() // 先初始化 userAgents
m.initDbusSignalListen()
m.initDSettingsChangedHandle()
m.syncThirdPartyDconfig()
Expand Down Expand Up @@ -934,6 +935,11 @@ func (m *Manager) handleSessionNew(sessionId string, sessionPath dbus.ObjectPath

uidStr := strconv.Itoa(int(userInfo.UID))

if m.userAgents == nil {
logger.Warning("userAgents not initialized, skipping addSession")
return
}

newlyAdded := m.userAgents.addSession(uidStr, session)
if newlyAdded {
m.watchSession(uidStr, session)
Expand All @@ -942,6 +948,10 @@ func (m *Manager) handleSessionNew(sessionId string, sessionPath dbus.ObjectPath

func (m *Manager) handleSessionRemoved(sessionId string, sessionPath dbus.ObjectPath) {
logger.Debug("session removed", sessionId, sessionPath)
if m.userAgents == nil {
logger.Warning("userAgents not initialized, skipping removeSession")
return
}
m.userAgents.removeSession(sessionPath)
}

Expand Down
Loading