Merge pull request #3058 from d-e-s-o/fix-FREE

do not check for NULL in FREE macro
2017-11-29 08:33:27 +01:00
parent 3e34122de4 865bd462b4
commit f6f198c3fe
5 changed files with 20 additions and 30 deletions
--- a/include/util.h
+++ b/include/util.h
@ -47,12 +47,10 @@
        break;                            \
    }

-#define FREE(pointer)          \
-    do {                       \
-        if (pointer != NULL) { \
-            free(pointer);     \
-            pointer = NULL;    \
-        }                      \
+#define FREE(pointer)   \
+    do {                \
+        free(pointer);  \
+        pointer = NULL; \
    } while (0)

 #define CALL(obj, member, ...) obj->member(obj, ##__VA_ARGS__)