[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.5-1-2-gd30599c

[Simon McVittie]

The following commit has been merged in the master branch:
commit d30599cb3432c5d04ce62446faa4e235df0fb3ae
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Aug 2 11:12:39 2010 +0100

    Add patch from ioquake3 r1788 to avoid buffer overflows

diff --git a/debian/changelog b/debian/changelog
index f3deef8..05fcbb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openarena (0.8.5-2) UNRELEASED; urgency=low
+
+  * Improve patch tagging/attribution
+  * Add patch from ioquake3 r1788 to avoid buffer overflows
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 02 Aug 2010 10:57:59 +0100
+
 openarena (0.8.5-1) experimental; urgency=low
 
   * New upstream version (Closes: #573995)
diff --git a/debian/patches/0038-Fix-buffer-overflow-report-and-patch-by-Eugene-C.-46.patch b/debian/patches/0038-Fix-buffer-overflow-report-and-patch-by-Eugene-C.-46.patch
new file mode 100644
index 0000000..6e48d84
--- /dev/null
+++ b/debian/patches/0038-Fix-buffer-overflow-report-and-patch-by-Eugene-C.-46.patch
@@ -0,0 +1,37 @@
+From: Thilo Schulz <thilo>
+Date: Fri, 2 Jul 2010 20:21:20 +0000
+Subject: [PATCH] Fix buffer overflow, report and patch by Eugene C. (#4669)
+
+Origin: upstream, ioquake3 svn://svn.icculus.org/quake3/trunk@1788
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4669
+git-svn-id: svn://svn.icculus.org/quake3/trunk@1788 edf5b092-35ff-0310-97b2-ce42778d08ea
+---
+ engine/code/qcommon/msg.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/engine/code/qcommon/msg.c b/engine/code/qcommon/msg.c
+index 04fb424..889b32d 100644
+--- a/engine/code/qcommon/msg.c
++++ b/engine/code/qcommon/msg.c
+@@ -1043,6 +1043,10 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
+ 	numFields = sizeof(entityStateFields)/sizeof(entityStateFields[0]);
+ 	lc = MSG_ReadByte(msg);
+ 
++	if ( lc > numFields || lc < 0 ) {
++		Com_Error( ERR_DROP, "invalid entityState field count" );
++	}
++
+ 	// shownet 2/3 will interleave with other printed info, -1 will
+ 	// just print the delta records`
+ 	if ( cl_shownet->integer >= 2 || cl_shownet->integer == -1 ) {
+@@ -1376,6 +1380,10 @@ void MSG_ReadDeltaPlayerstate (msg_t *msg, playerState_t *from, playerState_t *t
+ 	numFields = sizeof( playerStateFields ) / sizeof( playerStateFields[0] );
+ 	lc = MSG_ReadByte(msg);
+ 
++	if ( lc > numFields || lc < 0 ) {
++		Com_Error( ERR_DROP, "invalid playerState field count" );
++	}
++
+ 	for ( i = 0, field = playerStateFields ; i < lc ; i++, field++ ) {
+ 		fromF = (int *)( (byte *)from + field->offset );
+ 		toF = (int *)( (byte *)to + field->offset );
diff --git a/debian/patches/series b/debian/patches/series
index 1c6d7f0..214d351 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@
 0035-Sys_LoadDll-use-FS_FindDll.patch
 0036-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
 0037-Put-a-error-marker-in-engine-s-ui_shared.h-to-make-s.patch
+0038-Fix-buffer-overflow-report-and-patch-by-Eugene-C.-46.patch

-- 
Packaging for the OpenArena engine