- MMS client: fixed potential problem in multi-variable write response parsing

5 years ago · 074cee0cbc
parent 22700a97b7
commit 074cee0cbc
2 changed files with 7 additions and 2 deletions
--- a/src/iec61850/client/client_goose_control.c
+++ b/src/iec61850/client/client_goose_control.c
@ -589,6 +589,7 @@ IedConnection_setGoCBValues(IedConnection self, IedClientError* error, ClientGoo
        }

        *error = iedConnection_mapMmsErrorToIedError(mmsError);
+
        goto exit_function;
    }
    else {
--- a/src/mms/iso_mms/client/mms_client_write.c
+++ b/src/mms/iso_mms/client/mms_client_write.c
@ -132,8 +132,12 @@ mmsClient_parseWriteMultipleItemsResponse(ByteBuffer* message, int32_t bufPos, M
 exit_with_error:
    *mmsError = MMS_ERROR_PARSING_RESPONSE;

-    if (accessResults != NULL)
-        LinkedList_destroyDeep(*accessResults, (LinkedListValueDeleteFunction) MmsValue_delete);
+    if (accessResults != NULL) {
+        if (*accessResults) {
+            LinkedList_destroyDeep(*accessResults, (LinkedListValueDeleteFunction) MmsValue_delete);
+            *accessResults = NULL;
+        }
+    }
 }