Apply patch from Sven Vermeulen to fix problem with python3 bindings.

This commit is contained in:
Dan Walsh 2012-05-29 11:17:02 -04:00
parent 3f1912d3f6
commit 340a7403e4
2 changed files with 29 additions and 1 deletions

View File

@ -1,3 +1,28 @@
diff --git a/libsemanage/src/fcontext_record.c b/libsemanage/src/fcontext_record.c
index ec02a89..3f9d893 100644
--- a/libsemanage/src/fcontext_record.c
+++ b/libsemanage/src/fcontext_record.c
@@ -45,7 +45,11 @@ int semanage_fcontext_key_create(semanage_handle_t * handle,
"create file context key");
return STATUS_ERR;
}
- tmp_key->expr = expr;
+ tmp_key->expr = strdup(expr);
+ if (!tmp_key->expr) {
+ ERR(handle, "out of memory, could not create file context key.");
+ return STATUS_ERR;
+ }
tmp_key->type = type;
*key_ptr = tmp_key;
@@ -74,6 +78,7 @@ hidden_def(semanage_fcontext_key_extract)
void semanage_fcontext_key_free(semanage_fcontext_key_t * key)
{
+ free(key->expr);
free(key);
}
diff --git a/libsemanage/src/handle.c b/libsemanage/src/handle.c
index 4b43ba7..7fcd2b4 100644
--- a/libsemanage/src/handle.c

View File

@ -10,7 +10,7 @@
Summary: SELinux binary policy manipulation library
Name: libsemanage
Version: 2.1.7
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source: libsemanage-%{version}.tgz
@ -180,6 +180,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif # if with_python3
%changelog
* Tue May 29 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.7-2
- Apply patch from Sven Vermeulen to fix problem with python3 bindings.
* Thu Mar 29 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.7-1
- Update to upstream
* Alternate path for semanage.conf