* (bug #5709) Fix crash when invoked with --version
This commit is contained in:
1 parent
79bb668a9f
commit
37f2b4db90
2 files changed
+14
-3
No files matched your search
+13
-2
@@ -140,7 +140,12 @@ Sys_PIDFileName
|
||||
*/
|
||||
static char *Sys_PIDFileName( void )
|
||||
{
|
||||
return va( "%s/%s", Sys_DefaultHomePath( ), PID_FILENAME );
|
||||
const char *homePath = Sys_DefaultHomePath( );
|
||||
|
||||
if( *homePath != NULL )
|
||||
return va( "%s/%s", Sys_DefaultHomePath( ), PID_FILENAME );
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -156,6 +161,9 @@ qboolean Sys_WritePIDFile( void )
|
||||
FILE *f;
|
||||
qboolean stale = qfalse;
|
||||
|
||||
if( pidFile == NULL )
|
||||
return qfalse;
|
||||
|
||||
// First, check if the pid file is already there
|
||||
if( ( f = fopen( pidFile, "r" ) ) != NULL )
|
||||
{
|
||||
@@ -204,7 +212,10 @@ static __attribute__ ((noreturn)) void Sys_Exit( int exitCode )
|
||||
if( exitCode < 2 )
|
||||
{
|
||||
// Normal exit
|
||||
remove( Sys_PIDFileName( ) );
|
||||
char *pidFile = Sys_PIDFileName( );
|
||||
|
||||
if( pidFile != NULL )
|
||||
remove( pidFile );
|
||||
}
|
||||
|
||||
Sys_PlatformExit( );
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@ char *Sys_DefaultHomePath(void)
|
||||
{
|
||||
char *p;
|
||||
|
||||
if( !*homePath )
|
||||
if( !*homePath && com_homepath != NULL )
|
||||
{
|
||||
if( ( p = getenv( "HOME" ) ) != NULL )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user