From cd4b0f1d87e836e78c2de92623e20284a057b500 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Sun, 28 Mar 2021 11:16:45 -0400
Subject: fsade: Fix msan false positive in bfs_check_acl_type()

---
 fsade.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'fsade.c')

diff --git a/fsade.c b/fsade.c
index 7ba7a43..1444cf4 100644
--- a/fsade.c
+++ b/fsade.c
@@ -171,6 +171,12 @@ static int bfs_check_acl_type(acl_t acl, acl_type_t type) {
 
 #if __FreeBSD__
 	int trivial;
+
+#if BFS_HAS_FEATURE(memory_sanitizer, false)
+        // msan seems to be missing an interceptor for acl_is_trivial_np()
+        trivial = 0;
+#endif
+
 	if (acl_is_trivial_np(acl, &trivial) < 0) {
 		return -1;
 	} else if (trivial) {
@@ -178,9 +184,9 @@ static int bfs_check_acl_type(acl_t acl, acl_type_t type) {
 	} else {
 		return 1;
 	}
-#endif
-
+#else // !__FreeBSD__
 	return bfs_check_posix1e_acl(acl, true);
+#endif
 }
 
 int bfs_check_acl(const struct BFTW *ftwbuf) {
-- 
cgit v1.2.3