From aacd05e34bcc6abd44eb67613b68551b18fd4d99 Mon Sep 17 00:00:00 2001
From: Yakov Olkhovskiy <99031427+yakov-olkhovskiy@users.noreply.github.com>
Date: Mon, 6 Mar 2023 21:24:04 -0500
Subject: [PATCH] bugfix + review suggestion

---
 .../self-extracting-executable/decompressor.cpp  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/utils/self-extracting-executable/decompressor.cpp b/utils/self-extracting-executable/decompressor.cpp
index 8db0d95e70d..1374c269dc1 100644
--- a/utils/self-extracting-executable/decompressor.cpp
+++ b/utils/self-extracting-executable/decompressor.cpp
@@ -170,7 +170,7 @@ int decompress(char * input, char * output, off_t start, off_t end, size_t max_n
 
 bool isSudo()
 {
-    return getuid() == 0 && geteuid() == 0 && getenv("SUDO_USER") && getenv("SUDO_UID") && getenv("SUDO_GID"); // NOLINT(concurrency-mt-unsafe)
+    return geteuid() == 0 && getenv("SUDO_USER") && getenv("SUDO_UID") && getenv("SUDO_GID"); // NOLINT(concurrency-mt-unsafe)
 }
 
 /// Read data about files and decomrpess them.
@@ -423,6 +423,13 @@ int main(int/* argc*/, char* argv[])
     else
         name = file_path;
 
+    struct stat input_info;
+    if (0 != stat(self, &input_info))
+    {
+        perror("stat");
+        return 1;
+    }
+
 #if !defined(OS_DARWIN) && !defined(OS_FREEBSD)
     /// get inode of this executable
     uint64_t inode = getInode(self);
@@ -450,13 +457,6 @@ int main(int/* argc*/, char* argv[])
         return 1;
     }
 
-    struct stat input_info;
-    if (0 != stat(self, &input_info))
-    {
-        perror("stat");
-        return 1;
-    }
-
     /// inconsistency in WSL1 Ubuntu - inode reported in /proc/self/maps is a 64bit to
     /// 32bit conversion of input_info.st_ino
     if (input_info.st_ino & 0xFFFFFFFF00000000 && !(inode & 0xFFFFFFFF00000000))