Crashpad l33t hax0rs.crashpad

6 files changed, 34 insertions, 1 deletions

diff --git a/crashpad-configure.sh b/crashpad-configure.sh
new file mode 100644
index 000000000..3727de3b9
--- /dev/null
+++ b/crashpad-configure.sh
@@ -0,0 +1,5 @@
+crashpad=$HOME/src/crashpad/crashpad
+export CXXFLAGS="-I$crashpad -I$crashpad/third_party/mini_chromium/mini_chromium -I$crashpad/out/Default/gen"
+export LINKFLAGS="-L$crashpad/out/Default/obj/client -L$crashpad/out/Default/obj/handler -L$crashpad/out/Default/obj/util -L$crashpad/out/Default/obj/third_party/mini_chromium/mini_chromium/base"
+
+./waf configure --enable-debug
diff --git a/src/lib/crashpad.cc b/src/lib/crashpad.cc
new file mode 100644
index 000000000..6fadb7b40
--- /dev/null
+++ b/src/lib/crashpad.cc
@@ -0,0 +1,20 @@
+#include <client/crashpad_client.h>
+
+
+void
+setup_crashpad()
+{
+	crashpad::CrashpadClient client;
+	client.StartHandler(
+		base::FilePath("/home/carl/src/crashpad/crashpad/out/Default/crashpad_handler"),
+		base::FilePath("/home/carl/.config/dcpomatic2/crashpad"),
+		base::FilePath("/home/carl/.config/dcpomatic2/crashpad"),
+		"",
+		{},
+		{},
+		true,
+		false,
+		{}
+	);
+}
+
diff --git a/src/lib/crashpad.h b/src/lib/crashpad.h
new file mode 100644
index 000000000..eae91cbaa
--- /dev/null
+++ b/src/lib/crashpad.h
@@ -0,0 +1,2 @@
+extern void setup_crashpad();
+
diff --git a/src/lib/wscript b/src/lib/wscript
index dfe3ce487..90be0d059 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -60,6 +60,7 @@ sources = """
           combine_dcp_job.cc
           copy_dcp_details_to_film.cc
           cpu_j2k_encoder_thread.cc
+          crashpad.cc
           create_cli.cc
           crop.cc
           cross_common.cc
@@ -247,7 +248,7 @@ def build(bld):
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
                  CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT
-                 LIBZ SQLITE3
+                 LIBZ SQLITE3 CRASHPAD
                  """
 
     if bld.env.TARGET_OSX:
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index e80bfc333..6651b4ab7 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -66,6 +66,7 @@
 #include "lib/constants.h"
 #include "lib/content.h"
 #include "lib/content_factory.h"
+#include "lib/crashpad.h"
 #include "lib/cross.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
@@ -318,6 +319,7 @@ public:
 		, _right_panel(new wxPanel(_splitter, wxID_ANY))
 		, _film_viewer(_right_panel)
 	{
+		setup_crashpad();
 
 		auto bar = new wxMenuBar;
 		setup_menu (bar);
@@ -463,6 +465,8 @@ public:
 		film->set_name (path.filename().generic_string());
 		film->write_metadata ();
 		set_film (film);
+		int* p = 0;
+		*p = 42;
 	}
 
 	void load_film (boost::filesystem::path file)
diff --git a/wscript b/wscript
index 09c93897e..7037fa513 100644
--- a/wscript
+++ b/wscript
@@ -644,6 +644,7 @@ def configure(conf):
                    define_name="DCPOMATIC_HAVE_SQLITE3_PREPARE_V3",
                    mandatory=False)
 
+    conf.env.LIB_CRASHPAD = ['client', 'common', 'handler', 'util', 'base']
 
     # Other stuff