X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Flibadacl.c;h=f20d4a393c26f4e22a8e1cb77947214539b6fb5e;hb=a5d23c3d91c9a7b16e5aec08555133f9ded7d1bb;hp=1411536ea8e4963f2fe951058daac69b2715f5dd;hpb=0e4810e0a4e3ca231c1c526729d74200d7fef031;p=apply-default-acl.git

diff --git a/src/libadacl.c b/src/libadacl.c
index 1411536..f20d4a3 100644
--- a/src/libadacl.c
+++ b/src/libadacl.c
@@ -607,8 +607,14 @@ int acl_copy_xattr(int src_fd,
     return ACL_ERROR;
   }
   char* src_acl_p = alloca(src_size_guess);
-  /* The actual size may be smaller than our guess? I don't know. */
-  ssize_t src_size = fgetxattr(src_fd, src_name, src_acl_p, src_size_guess);
+  /* The actual size may be smaller than our guess? I don't know. The
+     return value from fgetxattr() will either be nonnegative, or
+     XATTR_ERROR (which we've already ruled out), so it's safe to cast
+     it to an unsigned size_t here to avoid a compiler warning. */
+  ssize_t src_size = fgetxattr(src_fd,
+                               src_name,
+                               src_acl_p,
+                               (size_t)src_size_guess);
   if (src_size == XATTR_ERROR) {
     if (errno == ENODATA) {
       /* A missing ACL isn't an error. */
@@ -618,7 +624,14 @@ int acl_copy_xattr(int src_fd,
     return ACL_ERROR;
   }
 
-  if (fsetxattr(dst_fd, dst_name, src_acl_p, src_size, 0) == XATTR_ERROR) {
+  /* See above: src_size must be nonnegative at this point,so we cast
+     it to size_t to avoid a compiler warning. */
+  if (fsetxattr(dst_fd,
+                dst_name,
+                src_acl_p,
+                (size_t)src_size,
+                0)
+      == XATTR_ERROR) {
     perror("acl_copy_xattr (fsetxattr)");
     return ACL_ERROR;
   }
@@ -680,9 +693,7 @@ int has_default_acl_fd(int fd) {
  *   - @c ACL_FAILURE - If symlinks or hard links are encountered.
  *   - @c ACL_ERROR - Unexpected library error.
  */
-int apply_default_acl_fds(int parent_fd,
-                          int fd,
-                          bool recursive) {
+int apply_default_acl_fds(int parent_fd, int fd, bool recursive) {
   int result = ACL_SUCCESS;
 
   /* The new ACL for this path */
@@ -1014,7 +1025,8 @@ int apply_default_acl(const char* path, bool recursive) {
   basename_path_copy = strdup(path);
   if (basename_path_copy == NULL) {
     perror("apply_default_acl (strdup)");
-    return ACL_ERROR;
+    result = ACL_ERROR;
+    goto cleanup;
   }
   fd = openat(parent_fd, basename(basename_path_copy), O_NOFOLLOW);
   if (fd == OPEN_ERROR) {