From ec0f2ce2a172ff061fec275f5adf449edfaf4a9c Mon Sep 17 00:00:00 2001
From: Kevin Jhang <kevin.jhang@ptlk.com.tw>
Date: Thu, 30 Sep 2021 17:29:01 +0800
Subject: [PATCH] Fixed NullReferenceException

---
 src/iec61850/server/mms_mapping/control.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/iec61850/server/mms_mapping/control.c b/src/iec61850/server/mms_mapping/control.c
index ea6bef22..e30df327 100644
--- a/src/iec61850/server/mms_mapping/control.c
+++ b/src/iec61850/server/mms_mapping/control.c
@@ -348,6 +348,9 @@ convertCheckHandlerResultToServiceError(CheckHandlerResult controlHandlerResult)
 static void
 updateGenericTrackingObjectValues(MmsMapping* self, ControlObject* controlObject, IEC61850_ServiceType serviceType, IEC61850_ServiceError errVal)
 {
+    if (controlObject == NULL)
+        return;
+
     copyControlValuesToTrackingObject(self, controlObject, serviceType);
 
     ServiceTrkInstance trkInst = NULL;