[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.42,1.43
Max Horn
fingolfin at users.sourceforge.net
Sun Oct 30 17:52:01 CET 2005
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16260/common
Modified Files:
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.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- config-manager.cpp 18 Oct 2005 01:30:17 -0000 1.42
+++ config-manager.cpp 31 Oct 2005 01:50:51 -0000 1.43
@@ -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