Added code to MyFree to NULL a pointer after freeing it

diff --git a/src/libopm.c b/src/libopm.c
index bcb320c759419e06abb28253fda9c2bf266b7df9..3a70dae388048b115777cc8056d901efaacf1ca5 100644 (file)
--- a/src/libopm.c
+++ b/src/libopm.c
@@ -188,8 +188,7 @@ void opm_remote_free(OPM_REMOTE_T *remote)
    OPM_NODE_T *p, *next;
    OPM_PROTOCOL_CONFIG_T *ppc;
 
-   if(remote->ip)
-      MyFree(remote->ip);
+   MyFree(remote->ip);
 
    LIST_FOREACH_SAFE(p, next, remote->protocols->head)
    {

diff --git a/src/malloc.c b/src/malloc.c
index 56c1cd37a7c46374e077c744c67a636c4210dcbd..17d2e010f93415d7246d29d812f3e074711e543f 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -64,8 +64,9 @@ void *libopm_MyMalloc(size_t bytes)
  *     None
  */
 
-void libopm_MyFree(void *var)
+void libopm_MyFree(void **var)
 {
-   if(var != NULL)
-      free(var);
+   if(*var != NULL)
+      free(*var);
+   *var = NULL;
 }

diff --git a/src/malloc.h b/src/malloc.h
index f15b1ac6c644bbfedaf18b6155b5abe80280a460..d5172d9222258ff99338c5ccf5551ac0d41a1b18 100644 (file)
--- a/src/malloc.h
+++ b/src/malloc.h
@@ -8,9 +8,9 @@
 #endif
 
 #define MyMalloc(SIZE) libopm_MyMalloc(SIZE)
-#define MyFree(X) libopm_MyFree(X)
+#define MyFree(X) libopm_MyFree(&X)
 
 void *libopm_MyMalloc(size_t bytes);
-void libopm_MyFree(void *var);
+void libopm_MyFree(void **var);
 
 #endif /* MALLOC_H */