Handle server name overflow properly
We need to make sure it is null terminated on truncation. We also
need to avoid giving a too large size argument or modern gcc will
complain.
diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index d7cbd6e..4a8370b 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -411,7 +411,8 @@
newServerName = loadViewerParameters(vncServerName);
// This might be empty, but we still need to clear it so we
// don't try to connect to the filename
- strncpy(vncServerName, newServerName, VNCSERVERNAMELEN);
+ strncpy(vncServerName, newServerName, VNCSERVERNAMELEN-1);
+ vncServerName[VNCSERVERNAMELEN-1] = '\0';
} catch (rfb::Exception& e) {
vlog.error("%s", e.str());
if (alertOnFatalError)
@@ -541,8 +542,10 @@
try {
const char* configServerName;
configServerName = loadViewerParameters(NULL);
- if (configServerName != NULL)
- strncpy(defaultServerName, configServerName, VNCSERVERNAMELEN);
+ if (configServerName != NULL) {
+ strncpy(defaultServerName, configServerName, VNCSERVERNAMELEN-1);
+ defaultServerName[VNCSERVERNAMELEN-1] = '\0';
+ }
} catch (rfb::Exception& e) {
vlog.error("%s", e.str());
if (alertOnFatalError)