diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index 4a9b341..94ce891 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -738,8 +738,9 @@
 	obfPwd.buf = data;
 	obfPwd.length  = datalen; 
 	PlainPasswd passwd(obfPwd);
+	obfPwd.takeBuf();
 	*password = strDup(passwd.buf);
-	memset(data, 0, strlen(data));
+	memset(data, 0, sizeof(data));
       }
     }
   }