From c846c4bd7c090f4e55c847eb693efd5704875a89 Mon Sep 17 00:00:00 2001
From: Zachary Slater <zachary@ioquake.org>
Date: Thu, 14 Jun 2012 18:28:58 +0000
Subject: CVE-2012-3345

---
 src/qcommon/qcommon.h |  1 -
 src/sys/sys_main.c    |  2 +-
 src/sys/sys_osx.m     | 22 ----------------------
 src/sys/sys_unix.c    | 17 -----------------
 src/sys/sys_win32.c   | 18 ------------------
 5 files changed, 1 insertion(+), 59 deletions(-)

(limited to 'src')

diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h
index 70fb6397..838087b7 100644
--- a/src/qcommon/qcommon.h
+++ b/src/qcommon/qcommon.h
@@ -1089,7 +1089,6 @@ char    *Sys_DefaultAppPath(void);
 
 void  Sys_SetDefaultHomePath(const char *path);
 char	*Sys_DefaultHomePath(void);
-const char	*Sys_TempPath(void);
 const char *Sys_Dirname( char *path );
 const char *Sys_Basename( char *path );
 char *Sys_ConsoleInput(void);
diff --git a/src/sys/sys_main.c b/src/sys/sys_main.c
index 0773b483..170107ae 100644
--- a/src/sys/sys_main.c
+++ b/src/sys/sys_main.c
@@ -141,7 +141,7 @@ Sys_PIDFileName
 */
 static char *Sys_PIDFileName( void )
 {
-	return va( "%s/%s", Sys_TempPath( ), PID_FILENAME );
+	return va( "%s/%s", Sys_DefaultHomePath( ), PID_FILENAME );
 }
 
 /*
diff --git a/src/sys/sys_osx.m b/src/sys/sys_osx.m
index 1efd08c0..5d567a7f 100644
--- a/src/sys/sys_osx.m
+++ b/src/sys/sys_osx.m
@@ -36,28 +36,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
-/*
-================
-Sys_TempPath
-================
-*/
-const char *Sys_TempPath( void )
-{
-	static UInt8 posixPath[ MAX_OSPATH ];
-	FSRef ref;
-	if( FSFindFolder( kOnAppropriateDisk,
-				kTemporaryFolderType, kCreateFolder, &ref ) == noErr )
-	{
-		if( FSRefMakePath( &ref, posixPath,
-					sizeof( posixPath ) - 1 ) == noErr )
-		{
-			return (const char *)posixPath;
-		}
-	}
-
-	return "/tmp";
-}
-
 /*
 ==============
 Sys_Dialog
diff --git a/src/sys/sys_unix.c b/src/sys/sys_unix.c
index a712e41d..53a86354 100644
--- a/src/sys/sys_unix.c
+++ b/src/sys/sys_unix.c
@@ -71,23 +71,6 @@ char *Sys_DefaultHomePath(void)
 	return homePath;
 }
 
-#ifndef MACOS_X
-/*
-================
-Sys_TempPath
-================
-*/
-const char *Sys_TempPath( void )
-{
-	const char *TMPDIR = getenv( "TMPDIR" );
-
-	if( TMPDIR == NULL || TMPDIR[ 0 ] == '\0' )
-		return "/tmp";
-	else
-		return TMPDIR;
-}
-#endif
-
 /*
 ================
 Sys_Milliseconds
diff --git a/src/sys/sys_win32.c b/src/sys/sys_win32.c
index 25e18424..2fb8b006 100644
--- a/src/sys/sys_win32.c
+++ b/src/sys/sys_win32.c
@@ -123,24 +123,6 @@ char *Sys_DefaultHomePath( void )
 	return homePath;
 }
 
-/*
-================
-Sys_TempPath
-================
-*/
-const char *Sys_TempPath( void )
-{
-	static TCHAR path[ MAX_PATH ];
-	DWORD length;
-
-	length = GetTempPath( sizeof( path ), path );
-
-	if( length > sizeof( path ) || length == 0 )
-		return Sys_DefaultHomePath( );
-	else
-		return path;
-}
-
 /*
 ================
 Sys_Milliseconds
-- 
cgit