Browse Source

fix(pubsub): Check for Null-Ptr in UA_Server_setWriterGroupOperational

Julius Pfrommer 5 years ago
parent
commit
58bd161557
1 changed files with 6 additions and 8 deletions
  1. 6 8
      src/pubsub/ua_pubsub_writer.c

+ 6 - 8
src/pubsub/ua_pubsub_writer.c

@@ -292,19 +292,17 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server, const UA_NodeId wr
 UA_StatusCode UA_EXPORT
 UA_Server_setWriterGroupOperational(UA_Server *server, const UA_NodeId writerGroup){
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-
-    UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_OPERATIONAL, wg);
-
-    return UA_STATUSCODE_GOOD;
+    if(!wg)
+        return UA_STATUSCODE_BADNOTFOUND;
+    return UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_OPERATIONAL, wg);
 }
 
 UA_StatusCode UA_EXPORT
 UA_Server_setWriterGroupDisabled(UA_Server *server, const UA_NodeId writerGroup){
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-
-    UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_DISABLED, wg);
-
-    return UA_STATUSCODE_GOOD;
+    if(!wg)
+        return UA_STATUSCODE_BADNOTFOUND;
+    return UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_DISABLED, wg);
 }
 
 /**********************************************/