src/tool_getparam.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index be41aa35d..b1b032b9f 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -23,6 +23,10 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
+#ifndef HAVE_WRITABLE_ARGV
+#define HAVE_WRITABLE_ARGV 1
+#endif
+
 #include "strcase.h"
 
 #include "curlx.h"
@@ -551,8 +555,13 @@ static void cleanarg(argv_item_t str)
    * argument out so that the username:password is not displayed in the
    * system process list */
   if(str) {
+#ifdef _UNICODE
+    size_t len = wcslen(str);
+    wmemset(str, L' ', len);
+#else
     size_t len = strlen(str);
     memset(str, ' ', len);
+#endif
   }
 }
 #else