diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-03-24 08:52:42 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-03-24 08:52:42 +0000 |
| commit | 29232e96e4c4aea7fa2df2cd96f25c9186ccf8e0 (patch) | |
| tree | 11ecd01b4f6e08ca8cd4c30aea87586d4a738c7f /sys-fs/e2fsprogs/files | |
| parent | make sure people dont stabilize this (diff) | |
| download | historical-29232e96e4c4aea7fa2df2cd96f25c9186ccf8e0.tar.gz historical-29232e96e4c4aea7fa2df2cd96f25c9186ccf8e0.tar.bz2 historical-29232e96e4c4aea7fa2df2cd96f25c9186ccf8e0.zip | |
Grab fix from upstream for blkid memleak #171844 by Andrej Filipcic and drop ext4 support #167562 by Maurice Volaski.
Package-Manager: portage-2.1.2.2
Diffstat (limited to 'sys-fs/e2fsprogs/files')
| -rw-r--r-- | sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39-r2 | 3 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.39-blkid-memleak.patch | 53 |
2 files changed, 56 insertions, 0 deletions
diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39-r2 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39-r2 new file mode 100644 index 000000000000..7e58444d768b --- /dev/null +++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39-r2 @@ -0,0 +1,3 @@ +MD5 06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz 3695111 +RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b e2fsprogs-1.39.tar.gz 3695111 +SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 e2fsprogs-1.39.tar.gz 3695111 diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-blkid-memleak.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-blkid-memleak.patch new file mode 100644 index 000000000000..ce8ee8a4bcc9 --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-blkid-memleak.patch @@ -0,0 +1,53 @@ +http://bugs.gentoo.org/171844 + +# HG changeset patch +# User tytso@mit.edu +# Date Tue Mar 6 19:56:18 2007 -0500 +# Node ID 5a2a75111d7a6fc4b5ee99663f252a42d5a2b227 +# parent: 69a666bd25f57107a09e5bad0a158b8a810e6a63 +Fix memory leak in blkid library + +Addresses Debian Bug: #413661 + +Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> + +2007-03-06 Theodore Tso <tytso@mit.edu> + + * devname.c (dm_probe_all), probe.c (blkid_verify): Fix memory + leak. (Addresses Debian Bug #413661) + +--- a/lib/blkid/devname.c Sun Mar 4 08:17:18 2007 -0500 ++++ b/lib/blkid/devname.c Tue Mar 6 19:56:18 2007 -0500 +@@ -305,6 +305,7 @@ + probe_one(cache, device, dev, BLKID_PRI_DM, only_if_new); + + try_next: ++ free(device); + next = names->next; + } while (next); + +--- a/lib/blkid/probe.c Sun Mar 4 08:17:18 2007 -0500 ++++ b/lib/blkid/probe.c Tue Mar 6 19:56:18 2007 -0500 +@@ -886,9 +886,9 @@ + } + + if (!dev->bid_type) { +- if (probe.fd >= 0) close(probe.fd); + blkid_free_dev(dev); +- return NULL; ++ dev = 0; ++ goto found_type; + } + + found_type: +@@ -908,7 +908,8 @@ + free(probe.sbbuf); + if (probe.buf) + free(probe.buf); +- close(probe.fd); ++ if (probe.fd >= 0) ++ close(probe.fd); + + return dev; + } + |