diff --git a/unix/vncviewer/CConn.cxx b/unix/vncviewer/CConn.cxx
index 8231f4c..efc3c33 100644
--- a/unix/vncviewer/CConn.cxx
+++ b/unix/vncviewer/CConn.cxx
@@ -221,8 +221,8 @@
   PasswdDialog dlg(dpy, title.buf, !user);
   if (!dlg.show()) throw rfb::Exception("Authentication cancelled");
   if (user)
-    *user = strDup(dlg.userEntry.getText());
-  *password = strDup(dlg.passwdEntry.getText());
+    *user = safe_strdup(dlg.userEntry.getText());
+  *password = safe_strdup(dlg.passwdEntry.getText());
 }
 
 
diff --git a/unix/vncviewer/vncviewer.cxx b/unix/vncviewer/vncviewer.cxx
index 4a47788..203df9a 100644
--- a/unix/vncviewer/vncviewer.cxx
+++ b/unix/vncviewer/vncviewer.cxx
@@ -218,7 +218,7 @@
   if (**vncServerName != '\0')
     *remoteHost = *vncServerName;
 
-  *gatewayHost = strDup (via.getValueStr ());
+  *gatewayHost = safe_strdup (via.getValueStr ());
   *vncServerName = new char[50];
   sprintf (*vncServerName, "localhost::%d", localPort);
 }