fix(pubsub): Make ua_pubsub_reader.c clang-analyzer clean

panicgh · Feb 28, 2021 · 9ff7139 · 9ff7139
1 parent 59d5b95
commit 9ff7139
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
@@ -597,21 +597,27 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server, const UA_NodeId read
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "PubSub RT Offset calculation: DataSetMessage generation failed");
+            UA_DataSetMessage_clear(dsm);
+            UA_free(dsm);
             return UA_STATUSCODE_BADINTERNALERROR;
         }
 
         /* Generate data set messages - Considering 1 DSM as max */
-        UA_UInt16 *dsWriterIds = (UA_UInt16 *) UA_calloc(1, sizeof(UA_UInt16));
+        UA_UInt16 *dsWriterIds = (UA_UInt16 *)UA_calloc(1, sizeof(UA_UInt16));
         if(!dsWriterIds) {
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "PubSub RT Offset calculation: DataSetWriterId creation failed");
+            UA_DataSetMessage_clear(dsm);
+            UA_free(dsm);
             return UA_STATUSCODE_BADOUTOFMEMORY;
         }
         *dsWriterIds = dataSetReader->config.dataSetWriterId;
 
-        UA_NetworkMessage *networkMessage = (UA_NetworkMessage *) UA_calloc(1, sizeof(UA_NetworkMessage));
+        UA_NetworkMessage *networkMessage = (UA_NetworkMessage *)UA_calloc(1, sizeof(UA_NetworkMessage));
         if(!networkMessage) {
             UA_free(dsWriterIds);
+            UA_DataSetMessage_clear(dsm);
+            UA_free(dsm);
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "PubSub RT Offset calculation: Network message creation failed");
             return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -623,6 +629,7 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server, const UA_NodeId read
             UA_free(networkMessage->payload.dataSetPayload.sizes);
             UA_free(networkMessage);
             UA_free(dsWriterIds);
+            UA_DataSetMessage_clear(dsm);
             UA_free(dsm);
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "PubSub RT Offset calculation: NetworkMessage generation failed");