Add various NULL pointer checks for good measure.

[apply-default-acl.git] / src / apply-default-acl.c

diff --git a/src/apply-default-acl.c b/src/apply-default-acl.c
index ea3ef6491a2d1ab374d707f86822439c21809be3..bebb27c9907cb43f4bfb43599b483b5c568c189d 100644 (file)
--- a/src/apply-default-acl.c
+++ b/src/apply-default-acl.c
@@ -9,6 +9,7 @@
 #define _XOPEN_SOURCE 500
 #define _GNU_SOURCE
 
+#include <errno.h>   /* EINVAL */
 #include <fcntl.h>   /* AT_FOO constants */
 #include <ftw.h>     /* nftw() et al. */
 #include <getopt.h>  /* getopt_long() */
@@ -67,6 +68,11 @@ bool path_accessible(const char* path) {
  *
  */
 void usage(const char* program_name) {
+  if (program_name == NULL) {
+    /* ??? */
+    return;
+  }
+
   printf("Apply any applicable default ACLs to the given files or "
         "directories.\n\n");
   printf("Usage: %s [flags] <target1> [<target2> [ <target3>...]]\n\n",
@@ -96,6 +102,13 @@ int apply_default_acl_nftw(const char *target,
                           int info,
                           struct FTW *ftw) {
 
+  if (target == NULL) {
+    errno = EINVAL;
+    perror("apply_default_acl_nftw (args)");
+    return ACL_ERROR;
+  }
+
+
   if (apply_default_acl_ex(target, sp, false) == ACL_ERROR) {
     /* I guess we do want to bail out for serious/unexpected errors? */
     return ACL_ERROR;
@@ -119,6 +132,12 @@ int apply_default_acl_nftw_x(const char *target,
                             int info,
                             struct FTW *ftw) {
 
+  if (target == NULL) {
+    errno = EINVAL;
+    perror("apply_default_acl_nftw_x (args)");
+    return ACL_ERROR;
+  }
+
   if (apply_default_acl_ex(target, sp, true) == ACL_ERROR) {
     /* I guess we do want to bail out for serious/unexpected errors? */
     return ACL_ERROR;
@@ -148,6 +167,12 @@ int apply_default_acl_nftw_x(const char *target,
  *   then we return @c ACL_ERROR. Otherwise, we return @c ACL_SUCCESS.
  */
 int apply_default_acl_recursive(const char *target, bool no_exec_mask) {
+  if (target == NULL) {
+    errno = EINVAL;
+    perror("apply_default_acl_recursive (args)");
+    return ACL_ERROR;
+  }
+
   int max_levels = 256;
   int flags = FTW_MOUNT | FTW_PHYS;