update(um): Message Deallocation

skuzzis · skuzzis · commit 54c73f8949d1 · 2024-08-09T01:17:27.000Z
diff --git a/src/plugins/core/scripting/usermessage.cpp b/src/plugins/core/scripting/usermessage.cpp
@@ -81,18 +81,14 @@ PluginUserMessage::PluginUserMessage(std::string msgname)
         return;
 
     this->msgid = msginfo->m_MessageId;
-    this->msgBuffer = msg->AllocateMessage()->ToPB<google::protobuf::Message>();
+    auto cnetmsg = msg->AllocateMessage();
+    this->msgBuffer = cnetmsg->ToPB<google::protobuf::Message>();
+    delete cnetmsg;
     this->internalMsg = msg;
 }
 
 PluginUserMessage::~PluginUserMessage()
 {
-    if (!this->internalMsg)
-        return;
-    if (!this->msgBuffer)
-        return;
-
-    this->internalMsg->DeallocateMessage(this->msgBuffer);
 }
 
 bool PluginUserMessage::IsValidMessage()

Original file line number	Diff line number	Diff line change
`@@ -81,18 +81,14 @@ PluginUserMessage::PluginUserMessage(std::string msgname)`
`81`	`81`	`return;`
`82`	`82`
`83`	`83`	`this->msgid = msginfo->m_MessageId;`
`84`		`- this->msgBuffer = msg->AllocateMessage()->ToPB<google::protobuf::Message>();`
	`84`	`+ auto cnetmsg = msg->AllocateMessage();`
	`85`	`+ this->msgBuffer = cnetmsg->ToPB<google::protobuf::Message>();`
	`86`	`+ delete cnetmsg;`
`85`	`87`	`this->internalMsg = msg;`
`86`	`88`	`}`
`87`	`89`
`88`	`90`	`PluginUserMessage::~PluginUserMessage()`
`89`	`91`	`{`
`90`		`- if (!this->internalMsg)`
`91`		`- return;`
`92`		`- if (!this->msgBuffer)`
`93`		`- return;`
`94`		`-`
`95`		`- this->internalMsg->DeallocateMessage(this->msgBuffer);`
`96`	`92`	`}`
`97`	`93`
`98`	`94`	`bool PluginUserMessage::IsValidMessage()`