44 lines
1.0 KiB
Diff
44 lines
1.0 KiB
Diff
diff --exclude-from=exclude -N -u -r nsalibselinux/src/booleans.c libselinux-1.23.5/src/booleans.c
|
|
--- nsalibselinux/src/booleans.c 2005-03-29 21:55:23.000000000 -0500
|
|
+++ libselinux-1.23.5/src/booleans.c 2005-04-12 08:48:47.000000000 -0400
|
|
@@ -45,7 +45,8 @@
|
|
char **n;
|
|
|
|
assert(len);
|
|
- assert(selinux_mnt);
|
|
+ if (!selinux_mnt)
|
|
+ return -1;
|
|
|
|
snprintf(path, sizeof path, "%s%s", selinux_mnt, SELINUX_BOOL_DIR);
|
|
*len = scandir(path, &namelist, &filename_select,
|
|
@@ -94,7 +95,8 @@
|
|
int fd, len;
|
|
char *fname = NULL;
|
|
|
|
- assert(selinux_mnt);
|
|
+ if (!selinux_mnt)
|
|
+ return -1;
|
|
|
|
*buf = (char*)malloc(sizeof(char) * (STRBUF_SIZE + 1));
|
|
if (!*buf)
|
|
@@ -164,7 +166,8 @@
|
|
int fd, ret, len;
|
|
char buf[2], *fname;
|
|
|
|
- assert(selinux_mnt);
|
|
+ if (!selinux_mnt)
|
|
+ return -1;
|
|
if ( value < 0 || value > 1 )
|
|
return -1;
|
|
|
|
@@ -203,7 +206,8 @@
|
|
char buf[2];
|
|
char path[PATH_MAX];
|
|
|
|
- assert(selinux_mnt);
|
|
+ if (!selinux_mnt)
|
|
+ return -1;
|
|
|
|
snprintf(path, sizeof path, "%s/commit_pending_bools", selinux_mnt);
|
|
fd = open(path, O_WRONLY);
|