[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.41.2.1,1.41.2.2

Max Horn fingolfin at users.sourceforge.net
Sun Oct 30 17:54:01 CET 2005


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16470/common

Modified Files:
      Tag: branch-0-8-0
	config-manager.cpp 
Log Message:
Fix another HOME buffer overflow attack vector

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.41.2.1
retrieving revision 1.41.2.2
diff -u -d -r1.41.2.1 -r1.41.2.2
--- config-manager.cpp	18 Oct 2005 02:11:17 -0000	1.41.2.1
+++ config-manager.cpp	31 Oct 2005 01:53:02 -0000	1.41.2.2
@@ -92,8 +92,9 @@
 void ConfigManager::loadDefaultConfigFile() {
 	char configFile[MAXPATHLEN];
 #if defined(UNIX)
-	if (getenv("HOME") != NULL)
-		sprintf(configFile,"%s/%s", getenv("HOME"), DEFAULT_CONFIG_FILE);
+	const char *home = getenv("HOME");
+	if (home != NULL && strlen(home) < MAXPATHLEN)
+		snprintf(configFile, MAXPATHLEN, "%s/%s", home, DEFAULT_CONFIG_FILE);
 	else
 		strcpy(configFile, DEFAULT_CONFIG_FILE);
 #else





More information about the Scummvm-git-logs mailing list