From 00bf70aa8c77a40ca8768f17c1fdf474a340d1e0 Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Thu, 26 May 2022 16:21:01 +0200
Subject: [PATCH] - fixed memory leak in server read request handling
 (LIB61850-325)

---
 src/mms/iso_mms/server/mms_read_service.c | 25 +++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/mms/iso_mms/server/mms_read_service.c b/src/mms/iso_mms/server/mms_read_service.c
index f933339c..b35ca580 100644
--- a/src/mms/iso_mms/server/mms_read_service.c
+++ b/src/mms/iso_mms/server/mms_read_service.c
@@ -331,25 +331,23 @@ static void
 addNamedVariableToResultList(MmsVariableSpecification* namedVariable, MmsDomain* domain, char* nameIdStr,
 		LinkedList /*<MmsValue>*/ values, MmsServerConnection connection, AlternateAccess_t* alternateAccess, bool isAccessToSingleVariable)
 {
-    if (namedVariable != NULL) {
+    if (namedVariable) {
 
         if (DEBUG_MMS_SERVER)
             printf("MMS read: found named variable %s with search string %s\n",
                     namedVariable->name, nameIdStr);
 
-        if (namedVariable->type == MMS_STRUCTURE) {
-
-            MmsValue* value = mmsServer_getValue(connection->server, domain, nameIdStr, connection, isAccessToSingleVariable);
-
-            if (alternateAccess != NULL) {
-
+        if (namedVariable->type == MMS_STRUCTURE)
+        {
+            if (alternateAccess)
+            {
                 char variableName[200];
                 variableName[0] = 0;
                 strcat(variableName, nameIdStr);
 
-                value = getComponent(connection, domain, alternateAccess, namedVariable, variableName);
+                MmsValue* value = getComponent(connection, domain, alternateAccess, namedVariable, variableName);
 
-                if (value != NULL) {
+                if (value) {
                     appendValueToResultList(value, values);
                 }
                 else {
@@ -357,7 +355,9 @@ addNamedVariableToResultList(MmsVariableSpecification* namedVariable, MmsDomain*
                 }
             }
             else {
-                if (value != NULL) {
+                MmsValue* value = mmsServer_getValue(connection->server, domain, nameIdStr, connection, isAccessToSingleVariable);
+
+                if (value) {
                     appendValueToResultList(value, values);
                 }
                 else {
@@ -368,7 +368,7 @@ addNamedVariableToResultList(MmsVariableSpecification* namedVariable, MmsDomain*
         }
         else if (namedVariable->type == MMS_ARRAY) {
 
-            if (alternateAccess != NULL) {
+            if (alternateAccess) {
                 alternateArrayAccess(connection, alternateAccess, domain,
                         nameIdStr, values, namedVariable);
             }
@@ -379,7 +379,7 @@ addNamedVariableToResultList(MmsVariableSpecification* namedVariable, MmsDomain*
         }
         else {
 
-            if (alternateAccess != NULL) {
+            if (alternateAccess) {
                 appendErrorToResultList(values, DATA_ACCESS_ERROR_OBJECT_NONE_EXISTENT);
             }
             else {
@@ -761,7 +761,6 @@ static void
 createNamedVariableListResponse(MmsServerConnection connection, MmsNamedVariableList namedList,
 		int invokeId, ByteBuffer* response, bool isSpecWithResult, VarAccessSpec* accessSpec)
 {
-
 	LinkedList /*<MmsValue>*/ values = LinkedList_create();
 	LinkedList variables = MmsNamedVariableList_getVariableList(namedList);