This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository armagetronad.
commit 01e2dc4437a7a8d6c0954cd67e8d97643f4ca2de Author: Markus Koschany <[email protected]> Date: Fri Sep 11 09:16:57 2015 +0200 Drop security.patch. Fixed upstream. --- debian/patches/security.patch | 152 ------------------------------------------ debian/patches/series | 1 - 2 files changed, 153 deletions(-) diff --git a/debian/patches/security.patch b/debian/patches/security.patch deleted file mode 100644 index af21e2b..0000000 --- a/debian/patches/security.patch +++ /dev/null @@ -1,152 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Tue, 10 Mar 2015 07:29:18 +0100 -Subject: security - ---- - ChangeLog | 18 ++++++++++++++++-- - NEWS | 9 +++++++++ - src/engine/eGameObject.cpp | 3 +++ - src/network/nNetwork.cpp | 21 +++++++++++++++++---- - src/tron/gServerBrowser.cpp | 2 +- - 5 files changed, 46 insertions(+), 7 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index d13b1cf..f2d5d33 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,7 +1,21 @@ - ------------------------------------------------------------------------ --r9916 | z-man | 2011-09-11 12:41:12 +0200 (Sun, 11 Sep 2011) | 2 lines -+r10712 | z-man | 2015-01-29 23:53:15 +0100 (Thu, 29 Jan 2015) | 2 lines - --Injecting source again. -+Tagging 0.2.8.3.3_rc1 -+ -+------------------------------------------------------------------------ -+r10706 | z-man | 2015-01-29 23:39:48 +0100 (Thu, 29 Jan 2015) | 1 line -+ -+Merging fixes for various potential bugs from 0.2.8. -+------------------------------------------------------------------------ -+r10505 | z-man | 2013-01-29 23:12:03 +0100 (Tue, 29 Jan 2013) | 2 lines -+ -+Fixing possible crash due to friends list buffer overrun; no exploit potential. -+ -+------------------------------------------------------------------------ -+r10393 | z-man | 2012-03-31 17:59:04 +0200 (Sat, 31 Mar 2012) | 2 lines -+ -+Backporting rare crashfix: Adding sound lock when alpha objects get resorted. - - ------------------------------------------------------------------------ - r9914 | z-man | 2011-09-11 12:40:11 +0200 (Sun, 11 Sep 2011) | 2 lines -diff --git a/NEWS b/NEWS -index 8347682..96f6abb 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,12 @@ -+Changes since 0.2.8.3.2: -+- security fix: do not read ahead of the beginning of network buffer. -+- security fix: don't attribute network errors from processing random -+ packets to the connection to the server -+- security fix: while at it, don't process random packets unless they -+ may be important -+- fix for potential crash with friend list filtering -+- fix for rare crash with sound lock -+ - Changes since 0.2.8.3.1: - - security fix: old style action commands from clients no loger cause hangs and crashes - - security fix: oversized packets are ignored properly -diff --git a/src/engine/eGameObject.cpp b/src/engine/eGameObject.cpp -index 7e11b2f..64d3138 100644 ---- a/src/engine/eGameObject.cpp -+++ b/src/engine/eGameObject.cpp -@@ -880,6 +880,9 @@ void eGameObject::RenderAll(eGrid *grid, const eCamera *cam){ - // but the small flickering error is to be tolerated, especially - // since alpha blended game objects tend to gently fade in. - int firstAlphaID = firstAlpha->id; -+ -+ eSoundLocker locker; -+ - grid->gameObjects.Remove(firstAlpha,firstAlpha->id); - grid->gameObjects.Add(firstAlpha,firstAlpha->id); - grid->gameObjects.Remove(object,object->id); -diff --git a/src/network/nNetwork.cpp b/src/network/nNetwork.cpp -index 1628f30..5cc9c86 100644 ---- a/src/network/nNetwork.cpp -+++ b/src/network/nNetwork.cpp -@@ -1413,6 +1413,10 @@ nServerInfoBase * sn_PeekRedirectTo() - } - - void login_deny_handler(nMessage &m){ -+ // only the server is allowed to send this -+ if(m.SenderID() != 0) -+ return; -+ - if ( !m.End() ) - { - // tOutput output; -@@ -1908,6 +1912,11 @@ void logout_handler(nMessage &m){ - unsigned short id = m.SenderID(); - //m.Read(id); - -+ // only the server or legal clients are allowed to send this -+ // (client check comes later) -+ if(sn_GetNetState() == nCLIENT && id != 0) -+ return; -+ - if (sn_Connections[id].socket) - { - tOutput o; -@@ -2266,7 +2275,7 @@ static void rec_peer(unsigned int peer){ - nAddress addrFrom; // the sender of the current packet - len = sn_Connections[peer].socket->Read( reinterpret_cast<int8 *>(buff),maxrec*2, addrFrom); - -- if (len>0){ -+ if (len>=2){ - if ( len >= maxrec*2 ) - { - #ifndef DEDICATED -@@ -2360,6 +2369,10 @@ static void rec_peer(unsigned int peer){ - } - else - { -+ // logged in clients should ignore packets from unknown sources -+ if(sn_GetNetState() != nSERVER && sn_myNetID != 0) -+ continue; -+ - // assume it's a new connection - id = MAXCLIENTS+1; - peers[ MAXCLIENTS+1 ] = addrFrom; -@@ -2491,7 +2504,7 @@ static void rec_peer(unsigned int peer){ - catch(nKillHim) - { - con << "nKillHim signal caught: "; -- sn_DisconnectUser(peer, "$network_kill_error"); -+ sn_DisconnectUser(id, "$network_kill_error"); - } - #endif - } -@@ -3332,9 +3345,9 @@ void sn_DisconnectUser(int i, const tOutput& reason, nServerInfoBase * redirectT - } - - // clients can only disconnect from the server -- if ( i != 0 && sn_GetNetState() == nCLIENT ) -+ if ( i != 0 && i <= MAXCLIENTS && sn_GetNetState() == nCLIENT ) - { -- tERR_ERROR( "Client tried to disconnect from another client: impossible and a bad idea." ); -+ tERR_WARN( "Client tried to disconnect from another client: impossible and a bad idea." ); - return; - } - -diff --git a/src/tron/gServerBrowser.cpp b/src/tron/gServerBrowser.cpp -index 14e92a4..e26db42 100644 ---- a/src/tron/gServerBrowser.cpp -+++ b/src/tron/gServerBrowser.cpp -@@ -392,7 +392,7 @@ void gServerMenu::Update() - int i; - tString userNames = run->UserNames(); - tString* friends = getFriends(); -- for (i = MAX_FRIENDS; i>=0; i--) -+ for (i = MAX_FRIENDS-1; i>=0; i--) - { - if (run->Users() > 0 && friends[i].Len() > 1 && userNames.StrPos(friends[i]) >= 0) - { diff --git a/debian/patches/series b/debian/patches/series index 6122a92..63f69db 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ desktop-file.patch -security.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/armagetronad.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
