From b8f821a6a61088473760d9a1e957601815146658 Mon Sep 17 00:00:00 2001
From: Clement <clement.brisset@gmail.com>
Date: Thu, 5 Jul 2018 12:05:48 -0700
Subject: [PATCH] Use binary path in args to find crashpad handler

---
 interface/src/CrashHandler.h            |  5 ++---
 interface/src/CrashHandler_Breakpad.cpp |  6 +++---
 interface/src/CrashHandler_Crashpad.cpp | 26 ++++++++++++++-----------
 interface/src/CrashHandler_None.cpp     |  7 ++++---
 interface/src/main.cpp                  |  2 +-
 5 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/interface/src/CrashHandler.h b/interface/src/CrashHandler.h
index 4a6483c700..6f8e9c3bf6 100644
--- a/interface/src/CrashHandler.h
+++ b/interface/src/CrashHandler.h
@@ -14,8 +14,7 @@
 
 #include <string>
 
-bool startCrashHandler();
+bool startCrashHandler(std::string appPath);
 void setCrashAnnotation(std::string name, std::string value);
 
-
-#endif
\ No newline at end of file
+#endif // hifi_CrashHandler_h
diff --git a/interface/src/CrashHandler_Breakpad.cpp b/interface/src/CrashHandler_Breakpad.cpp
index f2a174b6ea..c11e0e2a12 100644
--- a/interface/src/CrashHandler_Breakpad.cpp
+++ b/interface/src/CrashHandler_Breakpad.cpp
@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "CrashHandler.h"
-
 #if HAS_BREAKPAD
 
+#include "CrashHandler.h"
+
 #include <mutex>
 
 #include <client/linux/handler/exception_handler.h>
@@ -55,7 +55,7 @@ void flushAnnotations() {
     settings.sync();
 }
 
-bool startCrashHandler() {
+bool startCrashHandler(std::string appPath) {
     annotations["version"] = BuildInfo::VERSION;
     annotations["build_number"] = BuildInfo::BUILD_NUMBER;
     annotations["build_type"] = BuildInfo::BUILD_TYPE_STRING;
diff --git a/interface/src/CrashHandler_Crashpad.cpp b/interface/src/CrashHandler_Crashpad.cpp
index 76d4a8e2e1..d11969491a 100644
--- a/interface/src/CrashHandler_Crashpad.cpp
+++ b/interface/src/CrashHandler_Crashpad.cpp
@@ -9,21 +9,18 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#if HAS_CRASHPAD
+
 #include "CrashHandler.h"
 
 #include <assert.h>
 
-#include <QDebug>
-
-#if HAS_CRASHPAD
-
 #include <mutex>
 #include <string>
 
-#include <QStandardPaths>
+#include <QDebug>
 #include <QDir>
-
-#include <Windows.h>
+#include <QStandardPaths>
 
 #include <client/crashpad_client.h>
 #include <client/crash_report_database.h>
@@ -38,12 +35,13 @@ using namespace crashpad;
 static const std::string BACKTRACE_URL { CMAKE_BACKTRACE_URL };
 static const std::string BACKTRACE_TOKEN { CMAKE_BACKTRACE_TOKEN };
 
-extern QString qAppFileName();
-
 CrashpadClient* client { nullptr };
 std::mutex annotationMutex;
 crashpad::SimpleStringDictionary* crashpadAnnotations { nullptr };
 
+#ifdef Q_OS_WIN
+#include <Windows.h>
+
 LONG WINAPI vectoredExceptionHandler(PEXCEPTION_POINTERS pExceptionInfo) {
     if (!client) {
         return EXCEPTION_CONTINUE_SEARCH;
@@ -56,8 +54,9 @@ LONG WINAPI vectoredExceptionHandler(PEXCEPTION_POINTERS pExceptionInfo) {
 
     return EXCEPTION_CONTINUE_SEARCH;
 }
+#endif
 
-bool startCrashHandler() {
+bool startCrashHandler(std::string appPath) {
     if (BACKTRACE_URL.empty() || BACKTRACE_TOKEN.empty()) {
         return false;
     }
@@ -81,8 +80,13 @@ bool startCrashHandler() {
     QDir(crashpadDbDir).mkpath(crashpadDbName); // Make sure the directory exists
     const auto crashpadDbPath = crashpadDbDir.toStdString() + "/" + crashpadDbName;
 
+    static const QString CRASHPAD_HANDLER_NAME { "crashpad_handler" };
     // Locate Crashpad handler
-    const std::string CRASHPAD_HANDLER_PATH = QFileInfo(qAppFileName()).absolutePath().toStdString() + "/crashpad_handler.exe";
+    const QFileInfo interfaceBinary { QString::fromStdString(appPath) };
+    const QDir interfaceDir = interfaceBinary.dir();
+    assert(interfaceDir.exists(CRASHPAD_HANDLER_NAME));
+    const std::string CRASHPAD_HANDLER_PATH = interfaceDir.filePath(CRASHPAD_HANDLER_NAME).toStdString();
+    qDebug() << "CRASHPAD_HANDLER_PATH:" << CRASHPAD_HANDLER_PATH.c_str();
 
     // Setup different file paths
     base::FilePath::StringType dbPath;
diff --git a/interface/src/CrashHandler_None.cpp b/interface/src/CrashHandler_None.cpp
index cba585f7b7..77b8ab332e 100644
--- a/interface/src/CrashHandler_None.cpp
+++ b/interface/src/CrashHandler_None.cpp
@@ -9,14 +9,15 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#if !defined(HAS_CRASHPAD) && !defined(HAS_BREAKPAD)
+
 #include "CrashHandler.h"
 
 #include <assert.h>
+
 #include <QDebug>
 
-#if !defined(HAS_CRASHPAD) && !defined(HAS_BREAKPAD)
-
-bool startCrashHandler() {
+bool startCrashHandler(std::string appPath) {
     qDebug() << "No crash handler available.";
     return false;
 }
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index d6665f1036..85a83d88d1 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -91,7 +91,7 @@ int main(int argc, const char* argv[]) {
     qDebug() << "UserActivityLogger is enabled:" << ual.isEnabled();
 
     if (ual.isEnabled()) {
-        auto crashHandlerStarted = startCrashHandler();
+        auto crashHandlerStarted = startCrashHandler(argv[0]);
         qDebug() << "Crash handler started:" << crashHandlerStarted;
     }