From c7bc29e3705a7d07b3043cb76ec2f0df9bb85e71 Mon Sep 17 00:00:00 2001 From: Wangjunqi123 Date: Fri, 15 Nov 2024 10:57:40 +0800 Subject: [PATCH] agent: fix nil pointer dereference in agentosinfohandler() --- cmd/agent/app/register/handler/machine.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmd/agent/app/register/handler/machine.go b/cmd/agent/app/register/handler/machine.go index 71a90975..a0463b52 100644 --- a/cmd/agent/app/register/handler/machine.go +++ b/cmd/agent/app/register/handler/machine.go @@ -196,11 +196,18 @@ func AgentOSInfoHandler(c *network.SocketClient, msg *protocol.Message) error { systemAndCPUInfo := common.SystemAndCPUInfo{} if erros != nil || errcpu != nil { + err_str := "fail to get agent os info: " + if erros != nil { + err_str = fmt.Sprintf("%s hostinfo(%s) ", err_str, erros.Error()) + } + if errcpu != nil { + err_str = fmt.Sprintf("%s cpuinfo(%s) ", err_str, errcpu.Error()) + } resp_msg := &protocol.Message{ UUID: msg.UUID, Type: msg.Type, Status: -1, - Error: erros.Error(), + Error: err_str, Data: systemAndCPUInfo, } return c.Send(resp_msg) -- Gitee