ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-14 00:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

q3map2: getpwent() result may not be persistent

Browse source 
Use getpwuid_r() instead and store the path in a static buffer.
This commit is contained in:
Ben Noordhuis 2012-03-18 00:26:28 +01:00
parent c2be26a9bd
commit d7e9dab03d
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tools/quake3/q3map2/path_init.c
View file

@ -66,29 +66,23 @@ char *LokiGetHomeDir( void ){
#ifndef Q_UNIX #ifndef Q_UNIX
return NULL; return NULL;
#else #else
static char buf[ 4096 ];
struct passwd pw, *pwp;
char *home; char *home;
uid_t id;
struct passwd *pwd;
/* get the home environment variable */ /* get the home environment variable */
home = getenv( "HOME" ); home = getenv( "HOME" );
if ( home == NULL ) { if ( home ) {
/* do some more digging */ return Q_strncpyz( buf, home, sizeof( buf ) );
id = getuid();
setpwent();
while ( ( pwd = getpwent() ) != NULL )
{
if ( pwd->pw_uid == id ) {
home = pwd->pw_dir;
break;
}
}
endpwent();
} }
/* return it */ /* look up home dir in password database */
return home; if ( getpwuid_r( getuid(), &pw, buf, sizeof( buf ), &pwp ) == 0 ) {
return pw.pw_dir;
}
return NULL;
#endif #endif
} }