Browse Source

[FIX] PubSub: Resolve valgrind error when running
tutorial_pubsub_subscribe.c

- Copy data of specified length using UA_snprintf statement
in ua_pubsub.c
- Change UA_LOG_WARNING to UA_LOG_ERROR when variable node
addition fails in UA_Server_DataSetReader_addTargetVariables

Change-Id: I6c5947f7330d24a31d5d00d186015d6fc9f5f720
Signed-off-by: Thangavaila Kalyani Thangaraja <thangavaila.k@kalycito.com>

Thangavaila Kalyani Thangaraja 4 years ago
parent
commit
8159ff8841
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/pubsub/ua_pubsub.c

+ 2 - 2
src/pubsub/ua_pubsub.c

@@ -723,7 +723,7 @@ UA_StatusCode UA_Server_DataSetReader_addTargetVariables(UA_Server *server, UA_N
             vAttr.displayName.text = pDataSetReader->config.dataSetMetaData.fields[iteratorField].name;
             if(pDataSetReader->config.dataSetMetaData.fields[iteratorField].name.length < slen) {
                 slen = (UA_UInt16)pDataSetReader->config.dataSetMetaData.fields[iteratorField].name.length;
-                UA_snprintf(szTmpName, sizeof(szTmpName), "%s", (const char*)pDataSetReader->config.dataSetMetaData.fields[iteratorField].name.data);
+                UA_snprintf(szTmpName, sizeof(szTmpName), "%.*s", (int)slen, (const char*)pDataSetReader->config.dataSetMetaData.fields[iteratorField].name.data);
             }
 
             szTmpName[slen] = '\0';
@@ -744,7 +744,7 @@ UA_StatusCode UA_Server_DataSetReader_addTargetVariables(UA_Server *server, UA_N
             UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND, "addVariableNode %s succeeded", szTmpName);
         }
         else {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND, "addVariableNode: error 0x%x", retval);
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND, "addVariableNode: error 0x%x", retval);
         }
 
         UA_FieldTargetDataType_init(&targetVars.targetVariables[iteratorField]);