Merge 8f77fbdc6f into a13961110b

src/iec61850/client/ied_connection.c

@@ -2872,21 +2872,22 @@ IedConnection_getLogicalNodeDirectory(IedConnection self, IedClientError* error,
                         goto next_element;
 
                     int lnNameLen = (int)(fcPos - variableName);
-
+                    if (strlen(logicalNodeName) == lnNameLen){
-                    if (strncmp(variableName, logicalNodeName, lnNameLen) == 0)
+                        if (strncmp(variableName, logicalNodeName, lnNameLen) == 0)
-                    {
-                        char* fcEndPos = strchr(fcPos + 1, '$');
-
-                        if (fcEndPos)
                         {
-                            char* nameEndPos = strchr(fcEndPos + 1, '$');
+                            char* fcEndPos = strchr(fcPos + 1, '$');
-
+    
-                            if (nameEndPos == NULL)
+                            if (fcEndPos)
                             {
-                                char* dataObjectName = StringUtils_copyString(fcEndPos + 1);
+                                char* nameEndPos = strchr(fcEndPos + 1, '$');
-
+    
-                                if (!addToStringSet(lnDirectory, dataObjectName))
+                                if (nameEndPos == NULL)
-                                    GLOBAL_FREEMEM(dataObjectName);
+                                {
+                                    char* dataObjectName = StringUtils_copyString(fcEndPos + 1);
+    
+                                    if (!addToStringSet(lnDirectory, dataObjectName))
+                                        GLOBAL_FREEMEM(dataObjectName);
+                                }
                             }
                         }
                     }
@@ -3018,10 +3019,11 @@ IedConnection_getLogicalNodeVariables(IedConnection self, IedClientError* error,
         if (fcPos)
         {
             int lnNameLen = (int)(fcPos - variableName);
-
+            if (strlen(logicalNodeName) == lnNameLen){
-            if (strncmp(variableName, logicalNodeName, lnNameLen) == 0)
+                if (strncmp(variableName, logicalNodeName, lnNameLen) == 0)
-            {
+                {
-                LinkedList_add(lnDirectory, StringUtils_copyString(fcPos + 1));
+                    LinkedList_add(lnDirectory, StringUtils_copyString(fcPos + 1));
+                }
             }
         }