- Fix matchpathcon memory leak
This commit is contained in:
parent
4594aed06b
commit
eb8e2a0d36
@ -1,6 +1,26 @@
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.57/src/matchpathcon.c
|
||||
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);
|
||||
}
|
||||
|
||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.59/src/matchpathcon.c
|
||||
--- nsalibselinux/src/matchpathcon.c 2007-09-28 09:48:58.000000000 -0400
|
||||
+++ libselinux-2.0.57/src/matchpathcon.c 2008-02-28 14:33:51.000000000 -0500
|
||||
+++ libselinux-2.0.59/src/matchpathcon.c 2008-03-13 19:23:39.000000000 -0400
|
||||
@@ -2,6 +2,7 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
@ -4,7 +4,7 @@
|
||||
Summary: SELinux library and simple utilities
|
||||
Name: libselinux
|
||||
Version: 2.0.59
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: Public Domain
|
||||
Group: System Environment/Libraries
|
||||
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
|
||||
@ -137,6 +137,9 @@ exit 0
|
||||
%{python_sitearch}/selinux/*
|
||||
|
||||
%changelog
|
||||
* Thu Mar 13 2008 Dan Walsh <dwalsh@redhat.com> - 2.0.59-2
|
||||
- Fix matchpathcon memory leak
|
||||
|
||||
* Fri Feb 29 2008 Dan Walsh <dwalsh@redhat.com> - 2.0.59-1
|
||||
- Update to Upstream
|
||||
* Merged new X label "poly_selection" namespace from Eamon Walsh.
|
||||
|
Loading…
Reference in New Issue
Block a user