1 files changed, 7 insertions, 10 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
index b7852a0ac..df6bb1c89 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
@@ -279,15 +279,15 @@ void nxagentLaunchDialog(DialogType dialogType)
 
   if (dialogType == DIALOG_FAILED_RECONNECTION)
   {
-    strncpy(dialogDisplay, nxagentDisplayName, 255);
+    strncpy(dialogDisplay, nxagentDisplayName, sizeof(dialogDisplay) - 1);
   }
   else
   {
     strcpy(dialogDisplay, ":");
-    strncat(dialogDisplay, display, 254);
+    strncat(dialogDisplay, display, sizeof(dialogDisplay) - 1 - 1);
   }
 
-  *(dialogDisplay + 255) = '\0';
+  dialogDisplay[sizeof(dialogDisplay) - 1] = '\0';
 
   /*
    * We don't want to receive SIGCHLD
@@ -308,7 +308,7 @@ void nxagentLaunchDialog(DialogType dialogType)
               DECODE_DIALOG_TYPE(dialogType), *pid, dialogDisplay);
   #endif
 
-  *dialogDisplay = '\0';
+  dialogDisplay[0] = '\0';
 
   /*
    * Restore the previous set of
@@ -320,8 +320,7 @@ void nxagentLaunchDialog(DialogType dialogType)
 
 void nxagentPulldownDialog(Window wid)
 {
-  snprintf(nxagentPulldownWindow, 15, "%ld", (long int) wid);
-  nxagentPulldownWindow[15] = 0;
+  snprintf(nxagentPulldownWindow, sizeof(nxagentPulldownWindow), "%ld", (long int) wid);
 
   #ifdef TEST
   fprintf(stderr, "nxagentPulldownDialog: Going to launch pulldown "
@@ -330,7 +329,7 @@ void nxagentPulldownDialog(Window wid)
 
   nxagentLaunchDialog(DIALOG_PULLDOWN);
 
-  nxagentPulldownWindow[0] = 0;
+  nxagentPulldownWindow[0] = '\0';
 }
 
 void nxagentFailedReconnectionDialog(int alert, char *error)
@@ -372,9 +371,7 @@ void nxagentFailedReconnectionDialog(int alert, char *error)
     int status;
     int options = 0;
 
-    snprintf(nxagentFailedReconnectionMessage, 255, "Reconnection failed: %s", error);
-
-    *(nxagentFailedReconnectionMessage + 255) = '\0';
+    snprintf(nxagentFailedReconnectionMessage, sizeof(nxagentFailedReconnectionMessage), "Reconnection failed: %s", error);
 
     nxagentLaunchDialog(DIALOG_FAILED_RECONNECTION);