コミット: 49b59a3b555866406356c00d93666d68b297195b - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

コミットメタ情報

• リビジョン: 49b59a3b555866406356c00d93666d68b297195b (tree)
• 日時: 2009-04-19 16:43:42
• 作者: Benjamin Berkels <torr.samaho@quan...>
• コミッター: Benjamin Berkels

ログメッセージ

ported changes of the main trunk from revision 2066-2067:
- Removed unnecessarily linked libraries
- Fixed: The RCON utility crashed when somebody said a chat string with "%n" or similar printf compatible format parameters. Again thanks to kgsws for reporting.

SVN r2068 (0.97d3-hotfixes)

変更サマリ

• modified: docs/Skulltag Version History.txt
• modified: rcon_utility/main.cpp
• modified: rcon_utility/main.h
• modified: rcon_utility/rcon_utility.vcproj

差分

diff -r 1bf12a433252 -r 49b59a3b5558 docs/Skulltag Version History.txt
--- a/docs/Skulltag Version History.txt	Fri Apr 17 21:36:56 2009 +0000
+++ b/docs/Skulltag Version History.txt	Sun Apr 19 07:43:42 2009 +0000
@@ -17,6 +17,7 @@
 
 -	- Fixed a critical security bug of the server. Thanks a lot to kgsws for submitting a detailed report on this issue along with an implementation of the exploit. [Torr Samaho]
 -	- Fixed: A malicious client could skip the map authentication. Thanks to kgsws for his detailed report on this. [Torr Samaho]
+-	- Fixed: The RCON utility crashed when somebody said a chat string with "%n" or similar printf compatible format parameters. Again thanks to kgsws for reporting. [Torr Samaho]
 !	- Changed: All line breaks are removed from the comment when an entry is added to the banlist or whitelist. Thanks to kgsws for pointing me to this. [Torr Samaho]
 
 v0.97d3

diff -r 1bf12a433252 -r 49b59a3b5558 rcon_utility/main.cpp
--- a/rcon_utility/main.cpp	Fri Apr 17 21:36:56 2009 +0000
+++ b/rcon_utility/main.cpp	Sun Apr 19 07:43:42 2009 +0000
@@ -744,8 +744,9 @@
 		break;
 	case SVRC_MESSAGE:
 		
+		// [BB] The string may contain format parameters like %n, so we may not use Printf!
 		if ( g_State == STATE_CONNECTED )
-			Printf( NETWORK_ReadString( pByteStream ));
+			MAIN_Print( true, NETWORK_ReadString( pByteStream ));
 		break;
 	case SVRC_UPDATE:
 
@@ -907,13 +908,13 @@
 void VPrintf( bool bTimestamp, const char *pszString, va_list Parms )
 {
 	char	szOutLine[8192];
-	vsprintf( szOutLine, pszString, Parms );
+	vsprintf_s( szOutLine, pszString, Parms );
 	MAIN_Print( bTimestamp, szOutLine );
 }
 
 //*****************************************************************************
 //
-void MAIN_Print( bool bTimestamp, char *pszString )
+void MAIN_Print( bool bTimestamp, const char *pszString )
 {
 	main_UpdateStatusbar( pszString );
 	

diff -r 1bf12a433252 -r 49b59a3b5558 rcon_utility/main.h
--- a/rcon_utility/main.h	Fri Apr 17 21:36:56 2009 +0000
+++ b/rcon_utility/main.h	Sun Apr 19 07:43:42 2009 +0000
@@ -77,6 +77,6 @@
 int				Printf( const char *pszString, ... );
 int				Printf_NoTimestamp( const char *pszString, ... );
 void			VPrintf( bool bTimestamp, const char *pszString, va_list Parms );
-void			MAIN_Print( bool bTimestamp, char *pszString );
+void			MAIN_Print( bool bTimestamp, const char *pszString );
 
 #endif // __MAIN_H__

diff -r 1bf12a433252 -r 49b59a3b5558 rcon_utility/rcon_utility.vcproj
--- a/rcon_utility/rcon_utility.vcproj	Fri Apr 17 21:36:56 2009 +0000
+++ b/rcon_utility/rcon_utility.vcproj	Sun Apr 19 07:43:42 2009 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="rcon_utility"
 	ProjectGUID="{175EE94F-6232-4618-AE8E-087E51D22E94}"
 	RootNamespace="rcon_utility"
@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib wsock32.lib winmm.lib shell32.lib gdi32.lib user32.lib comctl32.lib shell32.lib advapi32.lib comdlg32.lib ole32.lib dxguid.lib dsound.lib ddraw.lib dinput8.lib strmiids.lib wsock32.lib winmm.lib setupapi.lib ws2_32.lib opengl32.lib glu32.lib fmodvc.lib"
+				AdditionalDependencies="user32.lib wsock32.lib winmm.lib shell32.lib gdi32.lib user32.lib comctl32.lib shell32.lib advapi32.lib comdlg32.lib ole32.lib dxguid.lib dsound.lib ddraw.lib dinput8.lib strmiids.lib wsock32.lib winmm.lib setupapi.lib ws2_32.lib"
 				OutputFile="./Debug/$(ProjectName).exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -138,7 +138,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gdi32.lib user32.lib comctl32.lib shell32.lib advapi32.lib comdlg32.lib ole32.lib dxguid.lib dsound.lib ddraw.lib dinput8.lib strmiids.lib wsock32.lib winmm.lib fmodvc.lib setupapi.lib ws2_32.lib opengl32.lib glu32.lib"
+				AdditionalDependencies="gdi32.lib user32.lib comctl32.lib shell32.lib advapi32.lib comdlg32.lib ole32.lib dxguid.lib dsound.lib ddraw.lib dinput8.lib strmiids.lib wsock32.lib winmm.lib setupapi.lib ws2_32.lib"
 				OutputFile="./Release/$(ProjectName).exe"
 			/>
 			<Tool