[Pkg-sdl-commits] r110 - in unstable/sdlgfx/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-02-09 23:06:54 +0100 (Fri, 09 Feb 2007)
New Revision: 110

Added:
   unstable/sdlgfx/debian/patches/100_rotozoom_allocation_checks.diff
Modified:
   unstable/sdlgfx/debian/changelog
   unstable/sdlgfx/debian/control
   unstable/sdlgfx/debian/patches/series
   unstable/sdlgfx/debian/rules
Log:
sdlgfx (2.0.13-3) unstable; urgency=high

  * debian/control:
    + Set policy 3.7.2.
    + Added XS-Vcs-Svn field.

  * debian/rules:
    + Add missing binary-indep target (Closes: #395744).

  * debian/patches/100_rotozoom_allocation_checks.diff:
    + Check for return values in the rotozoom routines, patch courtesy of
      Kevin Locke (Closes: #405154).

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri,  9 Feb 2007 22:51:50 +0100


Modified: unstable/sdlgfx/debian/changelog
===================================================================
--- unstable/sdlgfx/debian/changelog	2007-02-09 15:17:19 UTC (rev 109)
+++ unstable/sdlgfx/debian/changelog	2007-02-09 22:06:54 UTC (rev 110)
@@ -1,3 +1,18 @@
+sdlgfx (2.0.13-3) unstable; urgency=high
+
+  * debian/control:
+    + Set policy 3.7.2.
+    + Added XS-Vcs-Svn field.
+
+  * debian/rules:
+    + Add missing binary-indep target (Closes: #395744).
+
+  * debian/patches/100_rotozoom_allocation_checks.diff:
+    + Check for return values in the rotozoom routines, patch courtesy of
+      Kevin Locke (Closes: #405154).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri,  9 Feb 2007 22:51:50 +0100
+
 sdlgfx (2.0.13-2) unstable; urgency=low
 
   * Moved development to the pkg-sdl Alioth project.

Modified: unstable/sdlgfx/debian/control
===================================================================
--- unstable/sdlgfx/debian/control	2007-02-09 15:17:19 UTC (rev 109)
+++ unstable/sdlgfx/debian/control	2007-02-09 22:06:54 UTC (rev 110)
@@ -4,7 +4,8 @@
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
 Uploaders: Matthew Danish <mrd at debian.org>, Zephaniah E. Hull <warp at debian.org>, Lawrence Williams <lawrence_cecil_williams at hotmail.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
 Build-Depends: debhelper (>= 4.0), libsdl1.2-dev (>= 1.2.5-8), quilt
-Standards-Version: 3.6.2.1
+Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-sdl/unstable/sdlgfx
 
 Package: libsdl-gfx1.2-4
 Section: libs

Added: unstable/sdlgfx/debian/patches/100_rotozoom_allocation_checks.diff
===================================================================
--- unstable/sdlgfx/debian/patches/100_rotozoom_allocation_checks.diff	2007-02-09 15:17:19 UTC (rev 109)
+++ unstable/sdlgfx/debian/patches/100_rotozoom_allocation_checks.diff	2007-02-09 22:06:54 UTC (rev 110)
@@ -0,0 +1,77 @@
+--- SDL_rotozoom.c.orig	2004-11-29 07:40:21.000000000 -0700
++++ SDL_rotozoom.c	2006-12-31 17:21:01.000000000 -0700
+@@ -640,6 +640,8 @@
+ 	 */
+ 	rz_src =
+ 	    SDL_CreateRGBSurface(SDL_SWSURFACE, src->w, src->h, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000);
++	if (rz_src == NULL)
++	    return NULL;
+ 	SDL_BlitSurface(src, NULL, rz_src, NULL);
+ 	src_converted = 1;
+ 	is32bit = 1;
+@@ -702,6 +704,18 @@
+ 	    rz_dst = SDL_CreateRGBSurface(SDL_SWSURFACE, dstwidth, dstheight, 8, 0, 0, 0, 0);
+ 	}
+ 
++    	/*
++    	 * Bail if we were unable to allocate the zoomed surface
++    	 */
++    	if (rz_dst == NULL) {
++	    /*
++	     * Free the converted source surface if necessary
++	     */
++	    if (src_converted)
++	    	SDL_FreeSurface(rz_src);
++	    return NULL;
++    	}
++
+ 	/*
+ 	 * Lock source surface 
+ 	 */
+@@ -774,6 +788,18 @@
+ 	    rz_dst = SDL_CreateRGBSurface(SDL_SWSURFACE, dstwidth, dstheight, 8, 0, 0, 0, 0);
+ 	}
+ 
++    	/*
++    	 * Bail if we were unable to allocate the zoomed surface
++    	 */
++    	if (rz_dst == NULL) {
++	    /*
++	     * Free the converted source surface if necessary
++	     */
++	    if (src_converted)
++	    	SDL_FreeSurface(rz_src);
++	    return NULL;
++    	}
++
+ 	/*
+ 	 * Lock source surface 
+ 	 */
+@@ -892,6 +918,8 @@
+ 	 */
+ 	rz_src =
+ 	    SDL_CreateRGBSurface(SDL_SWSURFACE, src->w, src->h, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000);
++	if (rz_src == NULL)
++	    return NULL;
+ 	SDL_BlitSurface(src, NULL, rz_src, NULL);
+ 	src_converted = 1;
+ 	is32bit = 1;
+@@ -925,6 +953,18 @@
+     }
+ 
+     /*
++     * Bail if we were unable to allocate the zoomed surface
++     */
++    if (rz_dst == NULL) {
++	/*
++	 * Free the converted source surface if necessary
++	 */
++	if (src_converted)
++	    SDL_FreeSurface(rz_src);
++	return NULL;
++    }
++
++    /*
+      * Lock source surface 
+      */
+     SDL_LockSurface(rz_src);

Modified: unstable/sdlgfx/debian/patches/series
===================================================================
--- unstable/sdlgfx/debian/patches/series	2007-02-09 15:17:19 UTC (rev 109)
+++ unstable/sdlgfx/debian/patches/series	2007-02-09 22:06:54 UTC (rev 110)
@@ -8,3 +8,6 @@
 010_test_am_maintainer_mode.diff -p1
 010_test_remove_acinclude.diff -p1
 011_test_rebootstrap.diff -p1
+
+100_rotozoom_allocation_checks.diff -p0
+

Modified: unstable/sdlgfx/debian/rules
===================================================================
--- unstable/sdlgfx/debian/rules	2007-02-09 15:17:19 UTC (rev 109)
+++ unstable/sdlgfx/debian/rules	2007-02-09 22:06:54 UTC (rev 110)
@@ -73,5 +73,7 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
-binary: binary-arch
-.PHONY: build clean binary-arch binary install
+binary-indep: build install
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-arch binary-indep binary install