PR feedback

dotnet · Nov 18, 2021 · e3d8546 · e3d8546
1 parent 712e45c
commit e3d8546
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.IsMemberOfGroup.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.IsMemberOfGroup.cs
@@ -8,27 +8,13 @@ internal static partial class Interop
 {
     internal static partial class Sys
     {
-        internal static bool IsMemberOfGroup(uint gid)
+        internal static unsafe bool IsMemberOfGroup(uint gid)
         {
             if (gid == GetEGid())
             {
                 return true;
             }
 
-            uint[]? groups = GetGroups();
-            if (groups == null)
-            {
-                return false;
-            }
-
-            return Array.IndexOf(groups, gid) >= 0;
-        }
-
-        [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetEGid")]
-        private static partial uint GetEGid();
-
-        private static unsafe uint[]? GetGroups()
-        {
             const int InitialGroupsLength =
 #if DEBUG
                 1;
@@ -47,7 +33,7 @@ internal static bool IsMemberOfGroup(uint gid)
                 if (rv >= 0)
                 {
                     // success
-                    return groups.Slice(0, rv).ToArray();
+                    return groups.Slice(0, rv).IndexOf(gid) >= 0;
                 }
                 else if (rv == -1 && Interop.Sys.GetLastError() == Interop.Error.EINVAL)
                 {
@@ -56,13 +42,16 @@ internal static bool IsMemberOfGroup(uint gid)
                 }
                 else
                 {
-                    // failure
-                    return null;
+                    // failure (unexpected)
+                    return false;
                 }
             }
             while (true);
         }
 
+        [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetEGid")]
+        private static partial uint GetEGid();
+
         [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetGroups", SetLastError = true)]
         private static unsafe partial int GetGroups(int ngroups, uint* groups);
     }

diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Unix.cs
@@ -782,8 +782,7 @@ private static bool IsExecutable(string fullPath)
 
             if (euid == 0)
             {
-                // We're root.
-                return true;
+                return true; // We're root.
             }
 
             if (euid == fileinfo.Uid)