From faf94f65eef85cd65cf1d367816d0142d619c4e8 Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Tue, 27 Sep 2016 17:43:25 +0200 Subject: [PATCH] Fixed null pointer reference in executor --- common/executor.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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(e)); + { + auto ctx_info = boost::get_error_info(e); + + if (ctx_info) + e << context_info(get_context() + *ctx_info); + else + e << context_info(get_context()); + } throw; } -- 2.39.2