X Strike Force X.Org X11 SVN commit: r3144 - in trunk/lib/libxcursor/debian: . patches
Author: dnusinow
Date: 2006-08-30 20:40:23 -0400 (Wed, 30 Aug 2006)
New Revision: 3144
Added:
trunk/lib/libxcursor/debian/patches/
trunk/lib/libxcursor/debian/patches/01_leak_fixes.diff
trunk/lib/libxcursor/debian/patches/series
Modified:
trunk/lib/libxcursor/debian/changelog
trunk/lib/libxcursor/debian/control
trunk/lib/libxcursor/debian/rules
Log:
* Pull leak fixes from upstream (01_leak_fixes.diff)
Modified: trunk/lib/libxcursor/debian/changelog
===================================================================
--- trunk/lib/libxcursor/debian/changelog 2006-08-31 00:32:52 UTC (rev 3143)
+++ trunk/lib/libxcursor/debian/changelog 2006-08-31 00:40:23 UTC (rev 3144)
@@ -1,3 +1,9 @@
+libxcursor (1.1.7-4) UNRELEASED; urgency=low
+
+ * Pull leak fixes from upstream (01_leak_fixes.diff)
+
+ -- David Nusinow <dnusinow@debian.org> Wed, 30 Aug 2006 16:40:18 -0400
+
libxcursor (1.1.7-3) unstable; urgency=low
* Recompile for unstable's libxfixes3 3.0.1.
Modified: trunk/lib/libxcursor/debian/control
===================================================================
--- trunk/lib/libxcursor/debian/control 2006-08-31 00:32:52 UTC (rev 3143)
+++ trunk/lib/libxcursor/debian/control 2006-08-31 00:40:23 UTC (rev 3144)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <branden@debian.org>, ISHIKAWA Mutsumi <ishikawa@debian.org>, David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>
-Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev (>= 6.2.1+cvs.20050722-1), libx11-dev (>= 1:6.2.1+cvs.20050722-1), libxrender-dev (>= 1:0.9.0-1), libxfixes-dev (>= 1:3.0.0-2), pkg-config
+Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev (>= 6.2.1+cvs.20050722-1), libx11-dev (>= 1:6.2.1+cvs.20050722-1), libxrender-dev (>= 1:0.9.0-1), libxfixes-dev (>= 1:3.0.0-2), pkg-config, quilt
Standards-Version: 3.7.2
Package: libxcursor1
Added: trunk/lib/libxcursor/debian/patches/01_leak_fixes.diff
===================================================================
--- trunk/lib/libxcursor/debian/patches/01_leak_fixes.diff 2006-08-31 00:32:52 UTC (rev 3143)
+++ trunk/lib/libxcursor/debian/patches/01_leak_fixes.diff 2006-08-31 00:40:23 UTC (rev 3144)
@@ -0,0 +1,72 @@
+diff --git a/src/cursor.c b/src/cursor.c
+index 16c65ea..954fda4 100644
+--- a/src/cursor.c
++++ b/src/cursor.c
+@@ -47,6 +47,9 @@ XcursorCursorsDestroy (XcursorCursors *c
+ {
+ int n;
+
++ if (!cursors)
++ return;
++
+ --cursors->ref;
+ if (cursors->ref > 0)
+ return;
+@@ -73,6 +76,9 @@ XcursorAnimateCreate (XcursorCursors *cu
+ void
+ XcursorAnimateDestroy (XcursorAnimate *animate)
+ {
++ if (!animate)
++ return;
++
+ XcursorCursorsDestroy (animate->cursors);
+ free (animate);
+ }
+diff --git a/src/file.c b/src/file.c
+index 368961b..de78b05 100644
+--- a/src/file.c
++++ b/src/file.c
+@@ -47,8 +47,7 @@ XcursorImageCreate (int width, int heigh
+ void
+ XcursorImageDestroy (XcursorImage *image)
+ {
+- if (image)
+- free (image);
++ free (image);
+ }
+
+ XcursorImages *
+@@ -121,8 +120,7 @@ XcursorCommentCreate (XcursorUInt commen
+ void
+ XcursorCommentDestroy (XcursorComment *comment)
+ {
+- if (!comment)
+- free (comment);
++ free (comment);
+ }
+
+ XcursorComments *
+@@ -205,8 +203,7 @@ _XcursorWriteBytes (XcursorFile *file, c
+ static void
+ _XcursorFileHeaderDestroy (XcursorFileHeader *fileHeader)
+ {
+- if (!fileHeader)
+- free (fileHeader);
++ free (fileHeader);
+ }
+
+ static XcursorFileHeader *
+diff --git a/src/library.c b/src/library.c
+index 8cbc949..3c058ef 100644
+--- a/src/library.c
++++ b/src/library.c
+@@ -263,8 +263,7 @@ XcursorScanTheme (const char *theme, con
+ */
+ for (i = inherits; i && f == 0; i = _XcursorNextPath (i))
+ f = XcursorScanTheme (i, name);
+- if (inherits)
+- free (inherits);
++ free (inherits);
+ return f;
+ }
+
Added: trunk/lib/libxcursor/debian/patches/series
===================================================================
--- trunk/lib/libxcursor/debian/patches/series 2006-08-31 00:32:52 UTC (rev 3143)
+++ trunk/lib/libxcursor/debian/patches/series 2006-08-31 00:40:23 UTC (rev 3144)
@@ -0,0 +1 @@
+01_leak_fixes.diff
Modified: trunk/lib/libxcursor/debian/rules
===================================================================
--- trunk/lib/libxcursor/debian/rules 2006-08-31 00:32:52 UTC (rev 3143)
+++ trunk/lib/libxcursor/debian/rules 2006-08-31 00:40:23 UTC (rev 3144)
@@ -32,7 +32,7 @@
endif
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -46,7 +46,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: