From 21f198af7adc6ac3e2597d38f9065df31f1eadf1 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Sun, 15 Jul 2018 12:35:07 +0200
Subject: [PATCH] Fix debugger detection on macOS (#4511)

---
 components/crashcatcher/crashcatcher.cpp | 34 ++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
index af42eb695..e5377b64f 100644
--- a/components/crashcatcher/crashcatcher.cpp
+++ b/components/crashcatcher/crashcatcher.cpp
@@ -32,6 +32,10 @@ namespace bfs = boost::filesystem;
 #include <signal.h>
 #endif
 
+#if defined(__APPLE__)
+#include <sys/sysctl.h>
+#endif
+
 #define UNUSED(x) (void)(x)
 
 static const char crash_switch[] = "--cc-handle-crash";
@@ -460,6 +464,7 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig
 
 static bool is_debugger_present()
 {
+#if !defined (__APPLE__)
     bfs::ifstream file((bfs::path("/proc/self/status")));
     while (!file.eof())
     {
@@ -472,6 +477,35 @@ static bool is_debugger_present()
         }
     }
     return false;
+#else
+    int junk;
+    int mib[4];
+    struct kinfo_proc info;
+    size_t size;
+
+    // Initialize the flags so that, if sysctl fails for some bizarre
+    // reason, we get a predictable result.
+
+    info.kp_proc.p_flag = 0;
+
+    // Initialize mib, which tells sysctl the info we want, in this case
+    // we're looking for information about a specific process ID.
+
+    mib[0] = CTL_KERN;
+    mib[1] = KERN_PROC;
+    mib[2] = KERN_PROC_PID;
+    mib[3] = getpid();
+
+    // Call sysctl.
+
+    size = sizeof(info);
+    junk = sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, NULL, 0);
+    assert(junk == 0);
+
+    // We're being debugged if the P_TRACED flag is set.
+
+    return (info.kp_proc.p_flag & P_TRACED) != 0;
+#endif
 }
 
 void crashCatcherInstall(int argc, char **argv, const std::string &crashLogPath)