From: Helge Norberg <helge.norberg@svt.se>
Date: Tue, 27 Sep 2016 15:43:25 +0000 (+0200)
Subject: Fixed null pointer reference in executor
X-Git-Tag: 2.1.0_Beta1~54
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=faf94f65eef85cd65cf1d367816d0142d619c4e8

Fixed null pointer reference in executor
---

diff --git a/common/executor.h b/common/executor.h
index 805c1bc9d..e67a0afa7 100644
--- a/common/executor.h
+++ b/common/executor.h
@@ -257,7 +257,14 @@ private:
 			catch (const caspar_exception& e)
 			{
 				if (!is_current()) // Add context information from this thread before rethrowing.
-					e << context_info(get_context() + *boost::get_error_info<context_info_t>(e));
+				{
+					auto ctx_info = boost::get_error_info<context_info_t>(e);
+
+					if (ctx_info)
+						e << context_info(get_context() + *ctx_info);
+					else
+						e << context_info(get_context());
+				}
 
 				throw;
 			}