r1802 - in packages/trunk/abuse-sdl/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2006-10-07 14:24:25 +0000 (Sat, 07 Oct 2006)
New Revision: 1802

Added:
   packages/trunk/abuse-sdl/debian/patches/020_header_order.diff
   packages/trunk/abuse-sdl/debian/patches/020_stack_malloc_sizeof.diff
   packages/trunk/abuse-sdl/debian/patches/020_tint_fileptr.diff
Modified:
   packages/trunk/abuse-sdl/debian/changelog
   packages/trunk/abuse-sdl/debian/control
Log:
abuse-sdl (1:0.7.0-5) unstable; urgency=low

  * debian/control:
    + Added XS-Vcs-Svn information.

  * debian/patches/020_stack_malloc_sizeof.diff:
    + New patch courtesy of Kees Cook. Fix heap corruption and resulting
      at-exit crash (Closes: #188448).

  * debian/patches/020_tint_fileptr.diff:
    + New patch courtesy of Kees Cook. Fix invalid file pointer usage and
      first-run crash (Closes: #338834).

  * debian/patches/020_header_order.diff:
    + New patch courtesy of Kees Cook. Fix powerpc (and sparc) builds.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat,  7 Oct 2006 15:53:35 +0200


Modified: packages/trunk/abuse-sdl/debian/changelog
===================================================================
--- packages/trunk/abuse-sdl/debian/changelog	2006-10-07 10:24:34 UTC (rev 1801)
+++ packages/trunk/abuse-sdl/debian/changelog	2006-10-07 14:24:25 UTC (rev 1802)
@@ -1,9 +1,21 @@
-abuse-sdl (1:0.7.0-5) UNRELEASED; urgency=low
+abuse-sdl (1:0.7.0-5) unstable; urgency=low
 
-  * 
+  * debian/control:
+    + Added XS-Vcs-Svn information.
 
- -- Gonéri Le Bouder <goneri at rulezlan.org>  Thu,  5 Oct 2006 23:35:46 +0200
+  * debian/patches/020_stack_malloc_sizeof.diff:
+    + New patch courtesy of Kees Cook. Fix heap corruption and resulting
+      at-exit crash (Closes: #188448).
 
+  * debian/patches/020_tint_fileptr.diff:
+    + New patch courtesy of Kees Cook. Fix invalid file pointer usage and
+      first-run crash (Closes: #338834).
+
+  * debian/patches/020_header_order.diff:
+    + New patch courtesy of Kees Cook. Fix powerpc (and sparc) builds.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat,  7 Oct 2006 15:53:35 +0200
+
 abuse-sdl (1:0.7.0-4) unstable; urgency=low
 
   * Maintainer upload.

Modified: packages/trunk/abuse-sdl/debian/control
===================================================================
--- packages/trunk/abuse-sdl/debian/control	2006-10-07 10:24:34 UTC (rev 1801)
+++ packages/trunk/abuse-sdl/debian/control	2006-10-07 14:24:25 UTC (rev 1802)
@@ -5,6 +5,7 @@
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
 Build-Depends: debhelper (>> 4.0), quilt, libsdl1.2-dev
 Standards-Version: 3.7.2
+XS-Vcs-Svn: ssh://svn.debian.org/svn/pkg-games/packages/trunk/abuse-sdl/
 
 Package: abuse
 Architecture: any

Added: packages/trunk/abuse-sdl/debian/patches/020_header_order.diff
===================================================================
--- packages/trunk/abuse-sdl/debian/patches/020_header_order.diff	                        (rev 0)
+++ packages/trunk/abuse-sdl/debian/patches/020_header_order.diff	2006-10-07 14:24:25 UTC (rev 1802)
@@ -0,0 +1,12 @@
+--- abuse-sdl-0.7.0/src/version.cpp.orig	2006-09-26 22:16:47.000000000 -0700
++++ abuse-sdl-0.7.0/src/version.cpp	2006-09-26 22:16:56.000000000 -0700
+@@ -1,7 +1,7 @@
+-#include "dprint.hpp"
+ #include <stdio.h>
+-#include "macs.hpp"
+ #include <string.h>
++#include "dprint.hpp"
++#include "macs.hpp"
+ 
+ uint8_t major_version=2;
+ uint8_t minor_version=00;

Added: packages/trunk/abuse-sdl/debian/patches/020_stack_malloc_sizeof.diff
===================================================================
--- packages/trunk/abuse-sdl/debian/patches/020_stack_malloc_sizeof.diff	                        (rev 0)
+++ packages/trunk/abuse-sdl/debian/patches/020_stack_malloc_sizeof.diff	2006-10-07 14:24:25 UTC (rev 1802)
@@ -0,0 +1,27 @@
+--- abuse-sdl-0.7.0/src/include/stack.hpp.orig	2006-09-25 16:06:06.090418255 -0700
++++ abuse-sdl-0.7.0/src/include/stack.hpp	2006-09-25 16:09:09.434419282 -0700
+@@ -14,16 +14,22 @@ template<class T> class grow_stack      
+   public :
+   T **sdata;
+   long son;
++  long smax;
+ 
+-  grow_stack(int max_size) { sdata=(T **)jmalloc(max_size,"pointer stack");  son=0; }
++  grow_stack(int max_size) {
++    smax=max_size;
++    son=0;
++    sdata=(T **)jmalloc(sizeof(T *)*smax,"pointer stack");
++  }
+   void push(T *data) 
+   {
++    if (son>=smax) { lbreak("stack overflow (%ld)\n",smax); exit(1); }
+     sdata[son]=data;
+     son++;
+   }
+    
+   T *pop(long total) 
+-  { if (total>son) { lbreak("stack underflow\n"); exit(0); }
++  { if (total>son) { lbreak("stack underflow\n"); exit(1); }
+     son-=total;
+     return sdata[son];
+   }

Added: packages/trunk/abuse-sdl/debian/patches/020_tint_fileptr.diff
===================================================================
--- packages/trunk/abuse-sdl/debian/patches/020_tint_fileptr.diff	                        (rev 0)
+++ packages/trunk/abuse-sdl/debian/patches/020_tint_fileptr.diff	2006-10-07 14:24:25 UTC (rev 1802)
@@ -0,0 +1,30 @@
+--- abuse-sdl-0.7.0/src/light.cpp.orig	2006-09-25 17:46:16.134072762 -0700
++++ abuse-sdl-0.7.0/src/light.cpp	2006-09-25 17:48:20.081482467 -0700
+@@ -210,7 +210,6 @@ void calc_light_table(palette *pal)
+ 	if( fp->open_failure() )
+ 	{
+ 		recalc = 1;
+-		delete fp;
+ 	}
+ 	else
+ 	{
+@@ -226,8 +225,9 @@ void calc_light_table(palette *pal)
+ //			trans_table=(uint8_t *)jmalloc(256*256,"transparency table");
+ //			fp.read(trans_table,256*256);
+ 		}
+-		delete fp;
+ 	}
++	delete fp;
++	fp = NULL;
+ 
+ 	if( recalc )
+ 	{
+@@ -348,7 +348,7 @@ void calc_light_table(palette *pal)
+ //      f->write(green_light,256*64);
+ 			for (int i=0;i<TTINTS;i++)
+ 				f->write(tints[i],256);
+-			fp->write(bright_tint,256);
++			f->write(bright_tint,256);
+ //    f.write(trans_table,256*256);
+ 		}
+ 		delete f;