]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
acl-util: make sure acl_find_uid() initializes return parameters on success
authorLennart Poettering <lennart@poettering.net>
Tue, 21 Jul 2020 20:13:12 +0000 (22:13 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 25 Aug 2020 16:39:45 +0000 (18:39 +0200)
Let's follow our usual coding style and initialize return parameters on
success in all cases.

src/shared/acl-util.c

index dd2b1efb112901fd80a99ff11156c82bb6ebf9c4..641e5bda7a19e9f54d6bbe3434ecbdcc7df053fc 100644 (file)
 #include "user-util.h"
 #include "util.h"
 
-int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
+int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *ret_entry) {
         acl_entry_t i;
         int r;
 
         assert(acl);
-        assert(entry);
+        assert(uid_is_valid(uid));
+        assert(ret_entry);
 
         for (r = acl_get_entry(acl, ACL_FIRST_ENTRY, &i);
              r > 0;
@@ -41,13 +42,14 @@ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
                 acl_free(u);
 
                 if (b) {
-                        *entry = i;
+                        *ret_entry = i;
                         return 1;
                 }
         }
         if (r < 0)
                 return -errno;
 
+        *ret_entry = NULL;
         return 0;
 }