Re: libselinux/matchpathcon has a memory leak

[Daniel J Walsh <dwalsh@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The attached patch fixes the leaks.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkfZu+0ACgkQrlYvE4MpobPbRQCeOFM6HzBGz2N3l56z+yvHEGwl
/7sAnjiJkOYsJFZcR8yXrVCdOl3iRFT5
=+kwB
-----END PGP SIGNATURE-----

[-- Attachment #2: diff --]
[-- Type: text/plain, Size: 595 bytes --]

diff --exclude-from=exclude -N -u -r nsalibselinux/src/label.c libselinux-2.0.59/src/label.c
--- nsalibselinux/src/label.c	2007-07-16 14:20:46.000000000 -0400
+++ libselinux-2.0.59/src/label.c	2008-03-13 19:40:24.000000000 -0400
@@ -95,7 +95,7 @@
 	if (compat_validate(rec, lr, "file_contexts", 0))
 		return NULL;
 
-	if (translating &&
+	if (translating && (! lr->ctx_trans) &&
 	    selinux_raw_to_trans_context(lr->ctx_raw, &lr->ctx_trans))
 		return NULL;
 
@@ -131,6 +131,7 @@
 void selabel_close(struct selabel_handle *rec)
 {
 	rec->func_close(rec);
+	free(rec->data);
 	free(rec);
 }
 

[-- Attachment #3: diff.sig --]
[-- Type: application/pgp-signature, Size: 72 bytes --]