From da3fd176cd28e9d1fc9bfb47b70a6333d531f517 Mon Sep 17 00:00:00 2001
From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
Date: Sun, 23 Apr 2017 07:14:47 -0500
Subject: [PATCH] More safe-guards for util::thread_description

---
 hpx/util/thread_description.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hpx/util/thread_description.hpp b/hpx/util/thread_description.hpp
index c9155e6373ef..39f82a8a4494 100644
--- a/hpx/util/thread_description.hpp
+++ b/hpx/util/thread_description.hpp
@@ -61,7 +61,7 @@ namespace hpx { namespace util
         thread_description(char const* desc) HPX_NOEXCEPT
           : type_(data_type_description)
         {
-            data_.desc_ = desc;
+            data_.desc_ = desc ? desc : "<unknown>";
         }
 
 #if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
@@ -69,7 +69,7 @@ namespace hpx { namespace util
                 util::itt::string_handle const& sh) HPX_NOEXCEPT
           : type_(data_type_description)
         {
-            data_.desc_ = desc;
+            data_.desc_ = desc ? desc : "<unknown>";
             desc_itt_ = sh;
         }
 #endif