From 7c48fe64e3f1cdc61d9191d5e004d56d5244aa2c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 8 Aug 2019 19:53:17 +0200
Subject: [PATCH] util: introduce erase_and_free() helper

(cherry picked from commit a20dda788d5a0f3b300e0d8bb34e45be335e2915)

Signed-off-by: Guorui Yu <GuoRui.Yu@linux.alibaba.com>
---
 src/basic/util.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/basic/util.h b/src/basic/util.h
index ab3314f82e..4f4877b6b0 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -5,6 +5,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <malloc.h>
 #include <limits.h>
 #include <locale.h>
 #include <stdarg.h>
@@ -251,3 +252,20 @@ static inline void* explicit_bzero_safe(void *p, size_t l) {
 #else
 void *explicit_bzero_safe(void *p, size_t l);
 #endif
+
+static inline void* erase_and_free(void *p) {
+        size_t l;
+
+        if (!p)
+                return NULL;
+
+        l = malloc_usable_size(p);
+        explicit_bzero_safe(p, l);
+        free(p);
+
+        return NULL;
+}
+
+static inline void erase_and_freep(void *p) {
+        erase_and_free(*(void**) p);
+}
-- 
2.39.1