From e536f6819e1772b31b21a3b4e0eff11596f66352 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@fedoraproject.org>
Date: Tue, 5 Sep 2006 19:51:40 +0000
Subject: [PATCH] - get rid of 1.6M per bdev leak when probing.  yippie.

---
 e2fsprogs-1.39-leak.patch | 16 ++++++++++++++++
 e2fsprogs.spec            |  8 +++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 e2fsprogs-1.39-leak.patch

diff --git a/e2fsprogs-1.39-leak.patch b/e2fsprogs-1.39-leak.patch
new file mode 100644
index 0000000..d4ecbb4
--- /dev/null
+++ b/e2fsprogs-1.39-leak.patch
@@ -0,0 +1,16 @@
+--- e2fsprogs-1.39/lib/blkid/probe.c.leak	2006-09-05 15:41:13.000000000 -0400
++++ e2fsprogs-1.39/lib/blkid/probe.c	2006-09-05 15:40:19.000000000 -0400
+@@ -884,7 +884,12 @@
+ 	}
+ 
+ 	if (!dev->bid_type) {
+-		if (probe.fd >= 0) close(probe.fd);
++		if (probe.fd >= 0)
++                    close(probe.fd);
++	        if (probe.sbbuf)
++		    free(probe.sbbuf);
++	        if (probe.buf)
++		    free(probe.buf);
+ 		blkid_free_dev(dev);
+ 		return NULL;
+ 	}
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 9747604..29b6f4a 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.39
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -16,6 +16,7 @@ Patch36: e2fsprogs-1.38-etcblkid.patch
 Patch37: e2fsprogs-1.39-blkid-gfs.patch
 Patch38: e2fsprogs-1.39-blkid-devname.patch
 Patch39: e2fsprogs-1.39-multilib.patch
+Patch40: e2fsprogs-1.39-leak.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -77,6 +78,8 @@ also want to install e2fsprogs.
 %patch38 -p1 -b .devname
 # Fix multilib conflicts
 %patch39 -p1 -b .multilib
+# Fix probing from leaking memory in error cases.
+%patch40 -p1 -b .leak
 
 %build
 aclocal
@@ -228,6 +231,9 @@ exit 0
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Tue Sep  5 2006 Peter Jones <pjones@redhat.com> - 1.39-5
+- Fix memory leak in device probing.
+
 * Mon Jul 24 2006 Thomas Woerner <twoerner@redhat.com> - 1.39-4
 - fixed multilib devel conflicts (#192665)