[X2Go-Commits] [nx-libs] 08/19: Loop.cpp: improve/fix usage of s(n)printf

[git-admin at x2go.org]

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 14a5589186c7cf0ececadedecd3db3125466d22a
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Dec 27 13:16:35 2017 +0100

    Loop.cpp: improve/fix usage of s(n)printf
---
 nxcomp/src/Loop.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index e922b55..c6dc3fe 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -3939,7 +3939,8 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
     // this name cannot be changed as it is defined this way by the
     // local X server
-    int len = sprintf(unixSocketName + 1, "/tmp/.X11-unix/X%d", xPort);
+    int len = snprintf(unixSocketName + 1, DEFAULT_STRING_LENGTH - 1,
+                       "/tmp/.X11-unix/X%d", xPort);
     unixSocketName[0] = '\0';
 
     sockaddr_un *xServerAddrABSTRACT = new sockaddr_un;
@@ -3977,7 +3978,7 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
 
     char unixSocketDir[DEFAULT_STRING_LENGTH];
 
-    snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "/tmp/.X11-unix");
+    snprintf(unixSocketDir, DEFAULT_STRING_LENGTH, "/tmp/.X11-unix");
 
     #ifdef __APPLE__
 
@@ -3990,7 +3991,7 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
         *slash = '\0';
       }
 
-      snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s", display);
+      snprintf(unixSocketDir, DEFAULT_STRING_LENGTH, "%s", display);
     }
 
     #endif
@@ -4019,7 +4020,8 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
       HandleCleanup();
     }
 
-    sprintf(unixSocketName, "%s/X%d", unixSocketDir, xPort);
+    snprintf(unixSocketName, DEFAULT_STRING_LENGTH, "%s/X%d",
+             unixSocketDir, xPort);
 
     #ifdef __APPLE__
 

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