From 003f1ef73097ce530eaa4474392213775daa7768 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Fri, 24 Mar 2017 09:37:23 +0100 Subject: [PATCH] - fixed memory bugs in examples --- dotnet/reporting/ReportingExample.cs | 2 -- examples/iec61850_client_example1/client_example1.c | 6 ++++-- examples/iec61850_client_example2/client_example2.c | 5 ++++- examples/mms_utility/mms_utility.c | 1 + examples/server_example3/simpleIO_direct_control.icd | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dotnet/reporting/ReportingExample.cs b/dotnet/reporting/ReportingExample.cs index 9e84c86..454f437 100644 --- a/dotnet/reporting/ReportingExample.cs +++ b/dotnet/reporting/ReportingExample.cs @@ -93,8 +93,6 @@ namespace reporting rcb1.SetIntgPd(5000); rcb1.SetRptEna(true); - rcb1.SetRCBValues(); - rcb2.GetRCBValues(); if (rcb2.IsBuffered()) diff --git a/examples/iec61850_client_example1/client_example1.c b/examples/iec61850_client_example1/client_example1.c index 651c0c7..e20a232 100644 --- a/examples/iec61850_client_example1/client_example1.c +++ b/examples/iec61850_client_example1/client_example1.c @@ -65,8 +65,8 @@ int main(int argc, char** argv) { if (error != IED_ERROR_OK) printf("failed to write simpleIOGenericIO/GGIO1.NamPlt.vendor!\n"); - else - MmsValue_delete(value); + + MmsValue_delete(value); /* read data set */ @@ -117,6 +117,8 @@ int main(int argc, char** argv) { ClientDataSet_destroy(clientDataSet); + ClientReportControlBlock_destroy(rcb); + close_connection: IedConnection_close(con); diff --git a/examples/iec61850_client_example2/client_example2.c b/examples/iec61850_client_example2/client_example2.c index d199d0a..f2e6be3 100644 --- a/examples/iec61850_client_example2/client_example2.c +++ b/examples/iec61850_client_example2/client_example2.c @@ -42,8 +42,9 @@ printDataDirectory(char* doRef, IedConnection con, int spaces) sprintf(daRef, "%s.%s", doRef, daName); printDataDirectory(daRef, con, spaces + 2); } - } + + LinkedList_destroy(dataAttributes); } int @@ -145,6 +146,8 @@ main(int argc, char** argv) dataSetMemberRef = LinkedList_getNext(dataSetMemberRef); } + LinkedList_destroy(dataSetMembers); + dataSet = LinkedList_getNext(dataSet); } diff --git a/examples/mms_utility/mms_utility.c b/examples/mms_utility/mms_utility.c index 38ae099..da6ca12 100644 --- a/examples/mms_utility/mms_utility.c +++ b/examples/mms_utility/mms_utility.c @@ -352,6 +352,7 @@ int main(int argc, char** argv) { } exit: + free(hostname); MmsConnection_destroy(con); } diff --git a/examples/server_example3/simpleIO_direct_control.icd b/examples/server_example3/simpleIO_direct_control.icd index b48a383..0a0c635 100644 --- a/examples/server_example3/simpleIO_direct_control.icd +++ b/examples/server_example3/simpleIO_direct_control.icd @@ -87,9 +87,9 @@ - + - +