move to SAFE_FREE()

(This used to be commit a95943fde0ad89ae3f2deca2f7ba9cb5ab612b74)

1 files changed, 6 insertions, 10 deletions

diff --git a/source3/smbd/groupname.c b/source3/smbd/groupname.c
index 0640d4d7b2..eb2931d2a5 100644
--- a/source3/smbd/groupname.c
+++ b/source3/smbd/groupname.c
@@ -53,11 +53,9 @@ static void delete_groupname_map_list(void)
   groupname_map_entry *gmep;
 
   while((gmep = (groupname_map_entry *)ubi_slRemHead( &groupname_map_list )) != NULL) {
-    if(gmep->windows_name)
-      free(gmep->windows_name);
-    if(gmep->unix_name)
-      free(gmep->unix_name);
-    free((char *)gmep);
+    SAFE_FREE(gmep->windows_name);
+    SAFE_FREE(gmep->unix_name);
+    SAFE_FREE(gmep);
   }
 }
 
@@ -188,11 +186,9 @@ Error was %s.\n", unixname, strerror(errno) ));
     if(new_ep->windows_name == NULL || new_ep->unix_name == NULL) {
       DEBUG(0,("load_groupname_map: malloc fail for names in groupname_map_entry.\n"));
       fclose(fp);
-      if(new_ep->windows_name != NULL)
-        free(new_ep->windows_name);
-      if(new_ep->unix_name != NULL)
-        free(new_ep->unix_name);
-      free((char *)new_ep);
+      SAFE_FREE(new_ep->windows_name);
+      SAFE_FREE(new_ep->unix_name);
+      SAFE_FREE(new_ep);
       file_lines_free(lines);
       return;
     }