From 1cb330057e8ba1a88eff78815c4ca597301cdac2 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 23 Dec 2016 13:05:57 -0800
Subject: [PATCH] fix a crash and a memory leak in vhacd-util

---
 libraries/shared/src/Trace.h       | 5 ++++-
 tools/vhacd-util/src/VHACDUtil.cpp | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/shared/src/Trace.h b/libraries/shared/src/Trace.h
index f719969758..ee4f28f0ce 100644
--- a/libraries/shared/src/Trace.h
+++ b/libraries/shared/src/Trace.h
@@ -101,7 +101,10 @@ private:
 };
 
 inline void traceEvent(const QLoggingCategory& category, const QString& name, EventType type, const QString& id = "", const QVariantMap& args = {}, const QVariantMap& extra = {}) {
-    DependencyManager::get<Tracer>()->traceEvent(category, name, type, id, args, extra);
+    const auto& tracer = DependencyManager::get<Tracer>();
+    if (tracer) {
+        tracer->traceEvent(category, name, type, id, args, extra);
+    }
 }
 
 inline void traceEvent(const QLoggingCategory& category, const QString& name, EventType type, int id, const QVariantMap& args = {}, const QVariantMap& extra = {}) {
diff --git a/tools/vhacd-util/src/VHACDUtil.cpp b/tools/vhacd-util/src/VHACDUtil.cpp
index 9e28d33120..30d0b5e772 100644
--- a/tools/vhacd-util/src/VHACDUtil.cpp
+++ b/tools/vhacd-util/src/VHACDUtil.cpp
@@ -51,6 +51,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
             return false;
         }
         result = *geom;
+        delete geom;
 
         reSortFBXGeometryMeshes(result);
     } catch (const QString& error) {