[Pkg-sdl-commits] r143 - in unstable/sdlpango/debian: . patches

[sho at alioth.debian.org]

Author: sho
Date: 2007-10-08 19:52:21 +0000 (Mon, 08 Oct 2007)
New Revision: 143

Added:
   unstable/sdlpango/debian/patches/blit_overflow.patch
Modified:
   unstable/sdlpango/debian/changelog
   unstable/sdlpango/debian/patches/series
   unstable/sdlpango/debian/rules
Log:
sdlpango (0.1.2-3) unstable; urgency=low

  * debian/control:
    + Set DEB_QUILT_PATCHDIR_LINK to avoid build failures.

  * debian/patches/blit_overflow.patch:
    + Fix a blit overflow if rect->x or rect->y < 0 (Closes: #439855).

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 08 Oct 2007 19:50:42 +0000


Modified: unstable/sdlpango/debian/changelog
===================================================================
--- unstable/sdlpango/debian/changelog	2007-10-08 19:02:42 UTC (rev 142)
+++ unstable/sdlpango/debian/changelog	2007-10-08 19:52:21 UTC (rev 143)
@@ -1,3 +1,13 @@
+sdlpango (0.1.2-3) unstable; urgency=low
+
+  * debian/control:
+    + Set DEB_QUILT_PATCHDIR_LINK to avoid build failures.
+
+  * debian/patches/blit_overflow.patch:
+    + Fix a blit overflow if rect->x or rect->y < 0 (Closes: #439855).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 08 Oct 2007 19:50:42 +0000
+
 sdlpango (0.1.2-2) unstable; urgency=low
 
   [ Aurelien Jarno ]

Added: unstable/sdlpango/debian/patches/blit_overflow.patch
===================================================================
--- unstable/sdlpango/debian/patches/blit_overflow.patch	                        (rev 0)
+++ unstable/sdlpango/debian/patches/blit_overflow.patch	2007-10-08 19:52:21 UTC (rev 143)
@@ -0,0 +1,32 @@
+Index: sdlpango-0.1.2/src/SDL_Pango.c
+===================================================================
+--- sdlpango-0.1.2.orig/src/SDL_Pango.c	2007-10-08 19:44:15.000000000 +0000
++++ sdlpango-0.1.2/src/SDL_Pango.c	2007-10-08 19:45:27.000000000 +0000
+@@ -725,16 +725,23 @@
+     int x = rect->x;
+     int y = rect->y;
+ 
++    if(x < 0) {
++	width += x; x = 0;
++    }
+     if(x + width > surface->w) {
+ 	width = surface->w - x;
+-	if(width <= 0)
+-	    return;
++    }
++    if(width <= 0)
++	return;
++
++    if(y < 0) {
++	height += y; y = 0;
+     }
+     if(y + height > surface->h) {
+ 	height = surface->h - y;
+-	if(height <= 0)
+-	    return;
+     }
++    if(height <= 0)
++	return;
+ 
+     if(SDL_LockSurface(surface)) {
+ 	SDL_SetError("surface lock failed");

Modified: unstable/sdlpango/debian/patches/series
===================================================================
--- unstable/sdlpango/debian/patches/series	2007-10-08 19:02:42 UTC (rev 142)
+++ unstable/sdlpango/debian/patches/series	2007-10-08 19:52:21 UTC (rev 143)
@@ -3,3 +3,4 @@
 sans-serif.patch
 fillrect_crash.patch
 autotools.patch
+blit_overflow.patch

Modified: unstable/sdlpango/debian/rules
===================================================================
--- unstable/sdlpango/debian/rules	2007-10-08 19:02:42 UTC (rev 142)
+++ unstable/sdlpango/debian/rules	2007-10-08 19:52:21 UTC (rev 143)
@@ -2,3 +2,4 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+DEB_QUILT_PATCHDIR_LINK = debian/patches