[X2Go-Commits] [nx-libs] 06/29: Keyboard.c: replace malloc + strcpy by asprintf

git-admin at x2go.org git-admin at x2go.org
Sun Jan 7 01:30:58 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 2836c72f786e550252d75cf5f274245e8de5b5f9
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Fri Nov 24 00:54:14 2017 +0100

    Keyboard.c: replace malloc + strcpy by asprintf
---
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 9f1764c..cddb345 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -1899,18 +1899,16 @@ void nxagentKeycodeConversionSetup(void)
     char *sessionpath = nxagentGetSessionPath();
     if (sessionpath)
     {
-      int keyboard_file_path_size = strlen(sessionpath) + strlen("/keyboard");
-      char *keyboard_file_path = malloc((keyboard_file_path_size + 1) * sizeof(char));
+      char *keyboard_file_path = NULL;
       FILE *keyboard_file;
-      if (!keyboard_file_path)
+      if ((asprintf(&keyboard_file_path, "%s/keyboard", sessionpath) == -1))
       {
         free(sessionpath);
         FatalError("malloc for keyboard file path failed.");
       }
-      strcpy(keyboard_file_path, sessionpath);
-      strcat(keyboard_file_path, "/keyboard");
       free(sessionpath);
-      if ((keyboard_file = fopen(keyboard_file_path, "w"))) {
+      if ((keyboard_file = fopen(keyboard_file_path, "w")))
+      {
         if (drules)
           fprintf(keyboard_file, "rules=\"%s\"\n", drules[0] == '\0' ? "," : drules);
         if (dmodel)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list