Bug #5268: Fix small memory leak. (Matthias Clasen). Change some return 0sxcursor-1_1_7

    to NULL. Bump to 1.1.7.

4 files changed, 22 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 435e78b..b5f4352 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-03  Daniel Stone  <daniel@freedesktop.org>
+
+	* configure.ac:
+	* include/X11/Xcursor/Xcursor.h:
+	Bump to 1.1.7.
+
+	* src/file.c:
+	Bug #5268: Fix small memory leak.  (Matthias Clasen)
+	Change some return 0's to NULL.
+
 2006-04-27  Eric Anholt  <anholt@FreeBSD.org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 8154e2e..87df4e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ dnl version.  This same version number must appear in Xcursor.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from Xcursor.h
 dnl
-AC_INIT([libXcursor],1.1.6,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
+AC_INIT([libXcursor],1.1.7,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_MAINTAINER_MODE
diff --git a/include/X11/Xcursor/Xcursor.h b/include/X11/Xcursor/Xcursor.h
index da2266e..22b057a 100644
--- a/include/X11/Xcursor/Xcursor.h
+++ b/include/X11/Xcursor/Xcursor.h
@@ -78,7 +78,7 @@ typedef XcursorUInt	XcursorPixel;
 
 #define XCURSOR_LIB_MAJOR	1
 #define XCURSOR_LIB_MINOR	1
-#define XCURSOR_LIB_REVISION	6
+#define XCURSOR_LIB_REVISION	7
 #define XCURSOR_LIB_VERSION	((XCURSOR_LIB_MAJOR * 10000) + \
 				 (XCURSOR_LIB_MINOR * 100) + \
 				 (XCURSOR_LIB_REVISION))
diff --git a/src/file.c b/src/file.c
index de17004..368961b 100644
--- a/src/file.c
+++ b/src/file.c
@@ -655,16 +655,22 @@ XcursorXcFileLoadImages (XcursorFile *file, int size)
     int			toc;
     
     if (!file || size < 0)
-	return 0;
+	return NULL;
     fileHeader = _XcursorReadFileHeader (file);
     if (!fileHeader)
-	return 0;
+	return NULL;
     bestSize = _XcursorFindBestSize (fileHeader, (XcursorDim) size, &nsize);
     if (!bestSize)
-	return 0;
+    {
+        _XcursorFileHeaderDestroy (fileHeader);
+	return NULL;
+    }
     images = XcursorImagesCreate (nsize);
     if (!images)
-	return 0;
+    {
+        _XcursorFileHeaderDestroy (fileHeader);
+	return NULL;
+    }
     for (n = 0; n < nsize; n++)
     {
 	toc = _XcursorFindImageToc (fileHeader, bestSize, n);