Use snprintf() instead of sprintf()

Author: dcommander

client/ClientWin.cpp

@@ -1,6 +1,6 @@
 // Copyright (C)2004 Landmark Graphics Corporation
 // Copyright (C)2005, 2006 Sun Microsystems, Inc.
-// Copyright (C)2009, 2011, 2014, 2019 D. R. Commander
+// Copyright (C)2009, 2011, 2014, 2019, 2025 D. R. Commander
 //
 // This library is free software and may be redistributed and/or modified under
 // the terms of the wxWindows Library License, Version 3.1 or (at your option)
@@ -71,7 +71,7 @@ void ClientWin::initGL(void)
 {
 	GLFrame *newfb = NULL;
 	char dpystr[80];
-	sprintf(dpystr, ":%d.0", dpynum);
+	snprintf(dpystr, 80, ":%d.0", dpynum);
 	CriticalSection::SafeLock l(mutex);
 
 	if(drawMethod == RR_DRAWOGL)
@@ -108,7 +108,7 @@ void ClientWin::initX11(void)
 {
 	FBXFrame *newfb = NULL;
 	char dpystr[80];
-	sprintf(dpystr, ":%d.0", dpynum);
+	snprintf(dpystr, 80, ":%d.0", dpynum);
 	CriticalSection::SafeLock l(mutex);
 
 	if(drawMethod == RR_DRAWX11)
@@ -154,7 +154,7 @@ Frame *ClientWin::getFrame(bool useXV)
 		if(!xvframes[cfindex])
 		{
 			char dpystr[80];
-			sprintf(dpystr, ":%d.0", dpynum);
+			snprintf(dpystr, 80, ":%d.0", dpynum);
 			NEWCHECK(xvframes[cfindex] = new XVFrame(dpystr, window));
 			if(!xvframes[cfindex]) THROW("Could not allocate class instance");
 		}

client/vglclient.cpp

@@ -1,6 +1,6 @@
 // Copyright (C)2004 Landmark Graphics Corporation
 // Copyright (C)2005, 2006 Sun Microsystems, Inc.
-// Copyright (C)2011-2012, 2014, 2017-2019 D. R. Commander
+// Copyright (C)2011-2012, 2014, 2017-2019, 2025 D. R. Commander
 //
 // This library is free software and may be redistributed and/or modified under
 // the terms of the wxWindows Library License, Version 3.1 or (at your option)
@@ -145,9 +145,9 @@ void killproc(bool userOnly)
 
 				if(pid == getpid()) continue;
 				#ifdef sun
-				sprintf(temps, "/proc/%s/psinfo", dent->d_name);
+				snprintf(temps, 1024, "/proc/%s/psinfo", dent->d_name);
 				#else
-				sprintf(temps, "/proc/%s/stat", dent->d_name);
+				snprintf(temps, 1024, "/proc/%s/stat", dent->d_name);
 				#endif
 				if((fd = open(temps, O_RDONLY)) == -1) continue;
 				if(fstat(fd, &fsbuf) != -1 && (fsbuf.st_uid == getuid() || !userOnly))

common/Profiler.cpp

@@ -1,6 +1,6 @@
 // Copyright (C)2004 Landmark Graphics Corporation
 // Copyright (C)2005, 2006 Sun Microsystems, Inc.
-// Copyright (C)2014 D. R. Commander
+// Copyright (C)2014, 2025 D. R. Commander
 //
 // This library is free software and may be redistributed and/or modified under
 // the terms of the wxWindows Library License, Version 3.1 or (at your option)
@@ -15,8 +15,8 @@
 #include "Profiler.h"
 #include <stdlib.h>
 #include <string.h>
+#include "vglutil.h"
 #ifdef _MSC_VER
-#define snprintf  _snprintf
 #define strdup  _strdup
 #endif
 #include "Timer.h"

glxdemos/glinfo_common.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 1999-2014  Brian Paul   All Rights Reserved.
  * Copyright (C) 2005  Sun Microsystems, Inc.   All Rights Reserved.
- * Copyright (C) 2014, 2018-2019  D. R. Commander   All Rights Reserved.
+ * Copyright (C) 2014, 2018-2019, 2025  D. R. Commander   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,9 +28,7 @@
 #include <string.h>
 #include "glinfo_common.h"
 
-#ifdef _WIN32
-#define snprintf _snprintf
-#endif
+#include "vglutil.h"
 
 #ifndef GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT
 #define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001

include/Error.h

@@ -1,6 +1,6 @@
 // Copyright (C)2004 Landmark Graphics Corporation
 // Copyright (C)2005 Sun Microsystems, Inc.
-// Copyright (C)2014, 2019 D. R. Commander
+// Copyright (C)2014, 2019, 2025 D. R. Commander
 //
 // This library is free software and may be redistributed and/or modified under
 // the terms of the wxWindows Library License, Version 3.1 or (at your option)
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <errno.h>
 #include <new>
+#include "vglutil.h"
 
 
 namespace vglutil
@@ -54,7 +55,7 @@ namespace vglutil
 			void init(const char *method_, char *message_, int line)
 			{
 				message[0] = 0;
-				if(line >= 1) sprintf(message, "%d: ", line);
+				if(line >= 1) snprintf(message, MLEN + 1, "%d: ", line);
 				if(!method_) method_ = "(Unknown error location)";
 				method = method_;
 				if(message_)

server/vglconfigLauncher.h

@@ -1,5 +1,5 @@
 // Copyright (C)2007 Sun Microsystems, Inc.
-// Copyright (C)2014, 2018-2019 D. R. Commander
+// Copyright (C)2014, 2018-2019, 2025 D. R. Commander
 //
 // This library is free software and may be redistributed and/or modified under
 // the terms of the wxWindows Library License, Version 3.1 or (at your option)
@@ -56,7 +56,7 @@ namespace vglserver
 					unsetenv("LD_PRELOAD");
 					unsetenv("LD_PRELOAD_32");
 					unsetenv("LD_PRELOAD_64");
-					sprintf(commandLine, "%s -display %s -shmid %d -ppid %d",
+					snprintf(commandLine, 1024, "%s -display %s -shmid %d -ppid %d",
 						fconfig.config, DisplayString(dpy), shmid, getpid());
 					if(system(commandLine) == -1) THROW_UNIX();
 				}
@@ -89,9 +89,9 @@ namespace vglserver
 				{
 					errno = ENOMEM;  return -1;
 				}
-				sprintf(str, "%s=", name);
+				snprintf(str, strlen(name) + 2, "%s=", name);
 				putenv(str);
-				strcpy(str, "=");
+				strncpy(str, "=", strlen(name) + 2);
 				putenv(str);
 				return 0;
 			}