From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 6 Feb 2017 01:09:41 +0000 (-0500)
Subject: journalctl: replace string_erase with memset('x')
X-Git-Tag: v233~161^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5237%2Fhead;p=thirdparty%2Fsystemd.git

journalctl: replace string_erase with memset('x')

The compiler should not be able to optimize out the memset, because optarg is global
memory. In this case, not making the argument an empty string is nicer, so just use
an open-coded version of string_erase from before the explicit_bzero change.
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 2639fd6cf5a..9ad6f115a19 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -686,7 +686,9 @@ static int parse_argv(int argc, char *argv[]) {
                         r = free_and_strdup(&arg_verify_key, optarg);
                         if (r < 0)
                                 return r;
-                        string_erase(optarg);
+                        /* Use memset not string_erase so this doesn't look confusing
+                         * in ps or htop output. */
+                        memset(optarg, 'x', strlen(optarg));
 
                         arg_merge = false;
                         break;