From 0cb094b056166f502afca142ac7fea5f8a0b8a45 Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Thu, 21 Aug 2025 16:59:59 +0100
Subject: [PATCH] - code format updates and additional NULL pointer checks in
 map.c

---
 src/common/map.c                              | 27 ++++++++++++++-----
 src/iec61850/server/mms_mapping/mms_mapping.c |  3 ---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/common/map.c b/src/common/map.c
index c3873d90..2fcb1ab9 100644
--- a/src/common/map.c
+++ b/src/common/map.c
@@ -1,7 +1,7 @@
 /*
  *  map.c
  *
- *  Copyright 2013 Michael Zillgith
+ *  Copyright 2013-2025 Michael Zillgith
  *
  *  This file is part of libIEC61850.
  *
@@ -43,8 +43,13 @@ Map
 Map_create()
 {
     Map map = (Map) GLOBAL_CALLOC(1, sizeof(struct sMap));
-    map->entries = LinkedList_create();
-    map->compareKeys = comparePointerKeys;
+
+    if (map)
+    {
+        map->entries = LinkedList_create();
+        map->compareKeys = comparePointerKeys;
+    }
+
     return map;
 }
 
@@ -58,11 +63,19 @@ void*
 Map_addEntry(Map map, void* key, void* value)
 {
     MapEntry* entry = (MapEntry*) GLOBAL_MALLOC(sizeof(MapEntry));
-    entry->key = key;
-    entry->value = value;
-    LinkedList_add(map->entries, entry);
 
-    return entry->key;
+    if (entry)
+    {
+        entry->key = key;
+        entry->value = value;
+        LinkedList_add(map->entries, entry);
+
+        return entry->key;
+    }
+    else
+    {
+        return NULL;
+    }
 }
 
 void*
diff --git a/src/iec61850/server/mms_mapping/mms_mapping.c b/src/iec61850/server/mms_mapping/mms_mapping.c
index cc6c8ddb..cca93cb7 100644
--- a/src/iec61850/server/mms_mapping/mms_mapping.c
+++ b/src/iec61850/server/mms_mapping/mms_mapping.c
@@ -2877,7 +2877,6 @@ mmsWriteHandler(void* parameter, MmsDomain* domain, const char* variableId, int
     /* Report control blocks - BR, RP */
     if (isReportControlBlock(separator))
     {
-
         char* reportName = MmsMapping_getNextNameElement(separator + 1);
 
         if (reportName == NULL)
@@ -2900,7 +2899,6 @@ mmsWriteHandler(void* parameter, MmsDomain* domain, const char* variableId, int
 
             if (rc->domain == domain)
             {
-
                 int parentLNNameStrLen = strlen(rc->parentLN->name);
 
                 if (parentLNNameStrLen != lnNameLength)
@@ -2913,7 +2911,6 @@ mmsWriteHandler(void* parameter, MmsDomain* domain, const char* variableId, int
 
                 if (rcNameLen == variableIdLen)
                 {
-
                     if (strncmp(variableId, rc->name, variableIdLen) == 0)
                     {
                         const char* elementName = variableId + rcNameLen + 1;