Reconnect.c: simplify code by using strndup

Also abort reconnect on strndup failure.

Reconnect.c: simplify code by using strndup
d37f9f31 · Ulrich Sibiller · e52799d5 · d37f9f31
Commit d37f9f31 authored Oct 26, 2016 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 12 deletions

Reconnect.c nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +4 -12

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -438,22 +438,14 @@ Bool nxagentReconnectSession(void)

  if (nxagentKeyboard != NULL)
  {
-    int size;
-
-    size = strlen(nxagentKeyboard);
-
-    if ((nxagentOldKeyboard = malloc(size + 1)) != NULL)
+    nxagentOldKeyboard = strndup(nxagentKeyboard, strlen(nxagentKeyboard));
+    if (nxagentOldKeyboard == NULL)
    {
-      strncpy(nxagentOldKeyboard, nxagentKeyboard, size);
-
-      nxagentOldKeyboard[size] = '\0';
+      /* 0 means reconnection failed */
+      return 0;
    }
-  }

-  if (nxagentKeyboard)
-  {
    free(nxagentKeyboard);
-
    nxagentKeyboard = NULL;
  }