Merge branch 'uli42-pr/strings_fixes' into 3.6.x

nx-X11/programs/Xserver/hw/nxagent/Args.c

@@ -1296,7 +1296,17 @@ static void nxagentParseSingleOption(char *name, char *value)
   }
   else if (strcmp(name, "clients") == 0)
   {
-    snprintf(nxagentClientsLogName, NXAGENTCLIENTSLOGNAMELENGTH, "%s", value);
+    char *new = strdup(value);
+    if (new)
+    {
+      SAFE_free(nxagentClientsLogName);
+      nxagentClientsLogName = new;
+    }
+    else
+    {
+      fprintf(stderr, "Warning: Ignoring option [%s] because of memory problems\n",
+                      validateString(name));
+    }
     return;
   }
   else if (strcmp(name, "client") == 0)

nx-X11/programs/Xserver/hw/nxagent/Dialog.c

@@ -40,6 +40,7 @@
 #include "Args.h"
 #include "Display.h"
 #include "Dialog.h"
+#include "Utils.h"
 
 #include <nx/NX.h>
 #include "compext/Compext.h"
@@ -182,7 +183,6 @@ void nxagentResetDialog(int pid)
 
 void nxagentLaunchDialog(DialogType dialogType)
 {
-  char dialogDisplay[256];
   sigset_t set, oldSet;
   int *pid;
   char *type;
@@ -302,13 +302,23 @@ void nxagentLaunchDialog(DialogType dialogType)
   fprintf(stderr, "nxagentLaunchDialog: Launching dialog type [%d] message [%s].\n", type, message);
   #endif
 
+  char *dialogDisplay = NULL;
+  int len = 0;
   if (dialogType == DIALOG_FAILED_RECONNECTION)
   {
-    snprintf(dialogDisplay, sizeof(dialogDisplay), "%s", nxagentDisplayName);
+    len = asprintf(&dialogDisplay, "%s", nxagentDisplayName);
   }
   else
   {
-    snprintf(dialogDisplay, sizeof(dialogDisplay), ":%s", display);
+    len = asprintf(&dialogDisplay, ":%s", display);
+  }
+
+  if (len == -1)
+  {
+    #ifdef DEBUG
+    fprintf(stderr, "%s: could not allocate display string.\n", __func__);
+    #endif
+    return;
   }
 
   /*
@@ -329,7 +339,7 @@ void nxagentLaunchDialog(DialogType dialogType)
               DECODE_DIALOG_TYPE(dialogType), *pid, dialogDisplay);
   #endif
 
-  dialogDisplay[0] = '\0';
+  SAFE_free(dialogDisplay);
 
   /*
    * Restore the previous set of blocked signal.

nx-X11/programs/Xserver/hw/nxagent/Error.h

@@ -30,8 +30,7 @@
  * Clients log file name.
  */
 
-#define NXAGENTCLIENTSLOGNAMELENGTH 256
-extern char nxagentClientsLogName[NXAGENTCLIENTSLOGNAMELENGTH];
+extern char *nxagentClientsLogName;
 
 extern char nxagentVerbose;
 

nx-X11/programs/Xserver/hw/nxagent/Keyboard.c

@@ -1449,13 +1449,8 @@ static char* getKeyboardFilePath(void)
   {
     if ((asprintf(&keyboard_file_path, "%s/keyboard", sessionpath) == -1))
     {
-      SAFE_free(sessionpath);
       FatalError("malloc for keyboard file path failed.");
     }
-    else
-    {
-      SAFE_free(sessionpath);
-    }
   }
   else
   {