mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 07:15:18 +00:00
Code Issues Releases Wiki Activity

https://bugzilla.novell.com/show_bug.cgi?id=160330

Browse Source 
This patch prevents the parser from segv'ing if neither of the expected
default profile directories exist (/etc/subdomain.d, /etc/apparmor.d).
A profile passed on the command line or via stdin will still load, so
long as -I/path/to/includes is passed for any relevant includes files.
This commit is contained in:
Steve Beattie
2006-04-28 03:26:57 +00:00
parent 543b642d1f
commit 0508ea0128
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parser/apparmor-parser.spec.in
View File

@@ -25,7 +25,7 @@
Summary: AppArmor userlevel parser utility. Summary: AppArmor userlevel parser utility.
Name: apparmor-parser Name: apparmor-parser
Version: @@immunix_version@@ Version: @@immunix_version@@
Release: 14 Release: 15
Group: Applications/System Group: Applications/System
Source0: %{name}-%{version}-@@repo_version@@.tar.gz Source0: %{name}-%{version}-@@repo_version@@.tar.gz
License: GPL License: GPL
@@ -165,6 +165,8 @@ fi
%changelog %changelog
* Thu Apr 27 2006 Steve beattie <sbeattie@suse.de>
- Fix segv if profile dirs don't exist (#160330)
* Tue Apr 11 2006 Steve Beattie <sbeattie@suse.de> * Tue Apr 11 2006 Steve Beattie <sbeattie@suse.de>
- Move svn tree to novell forge; fixup build for new layout - Move svn tree to novell forge; fixup build for new layout
* Sat Apr 1 2006 Dominic Reynolds <dreynolds@suse.de> 2.0-7.5 * Sat Apr 1 2006 Dominic Reynolds <dreynolds@suse.de> 2.0-7.5

2
parser/parser_include.c
View File

@@ -191,7 +191,7 @@ int add_search_dir(char *dir)
return 0; return 0;
} }
if (strlen(dir) <= 0) if (!dir || strlen(dir) <= 0)
return 1; return 1;
t = malloc(strlen(dir) + 1); t = malloc(strlen(dir) + 1);