From fd03c3297c173b437beb97c8ca2d9a624beb5ce7 Mon Sep 17 00:00:00 2001
From: Tom Ritchford <tom@swirly.com>
Date: Wed, 27 May 2015 19:03:06 -0400
Subject: [PATCH] Fix dangling pointer in websocketpp/error.hpp.

---
 src/websocketpp/websocketpp/error.hpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/websocketpp/websocketpp/error.hpp b/src/websocketpp/websocketpp/error.hpp
index 6fff530757..12d06d09e3 100644
--- a/src/websocketpp/websocketpp/error.hpp
+++ b/src/websocketpp/websocketpp/error.hpp
@@ -222,25 +222,21 @@ public:
     {}
 
     explicit exception(lib::error_code ec)
-      : m_code(ec)
+            : m_msg(ec.message()), m_code(ec)
     {}
 
     ~exception() throw() {}
 
     virtual char const * what() const throw() {
-        if (m_msg.empty()) {
-            return m_code.message().c_str();
-        } else {
-            return m_msg.c_str();
-        }
+        return m_msg.c_str();
     }
 
     lib::error_code code() const throw() {
         return m_code;
     }
 
-    std::string m_msg;
-    lib::error_code m_code;
+    const std::string m_msg;
+    const lib::error_code m_code;
 };
 
 } // namespace websocketpp