X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fstring-util.c;fp=src%2Fbasic%2Fstring-util.c;h=9b060a9a20dbb181f715bf348c741275dff0e209;hp=b906b581c9a2d228d531aa107304790498ba0fce;hb=9270bff168ecc98d1761a32ca28b1f3906b093f2;hpb=85df5c16a4d10d955b204d9296827e108c0216a0

diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index b906b581c..9b060a9a2 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -825,6 +825,7 @@ int free_and_strdup(char **p, const char *s) {
         return 1;
 }
 
+#if !HAVE_DECL_EXPLICIT_BZERO
 /*
  * Pointer to memset is volatile so that compiler must de-reference
  * the pointer and can't assume that it points to any function in
@@ -835,19 +836,19 @@ typedef void *(*memset_t)(void *,int,size_t);
 
 static volatile memset_t memset_func = memset;
 
-void* memory_erase(void *p, size_t l) {
-        return memset_func(p, 'x', l);
+void explicit_bzero(void *p, size_t l) {
+        memset_func(p, '\0', l);
 }
+#endif
 
 char* string_erase(char *x) {
-
         if (!x)
                 return NULL;
 
         /* A delicious drop of snake-oil! To be called on memory where
          * we stored passphrases or so, after we used them. */
-
-        return memory_erase(x, strlen(x));
+        explicit_bzero(x, strlen(x));
+        return x;
 }
 
 char *string_free_erase(char *s) {