fixed: XArchEval "what" returns garbage (memory deleted).

src/lib/arch/XArch.cpp

@@ -1,38 +0,0 @@
-/*
- * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2012 Bolton Software Ltd.
- * Copyright (C) 2002 Chris Schoeneman
- * 
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file COPYING that should have accompanied this file.
- * 
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "arch/XArch.h"
-
-//
-// XArch
-//
-
-const char*
-XArch::what() const _NOEXCEPT
-{
-	const char* what = std::runtime_error::what();
-	try {
-		if (strlen(what) == 0 && m_eval != NULL) {
-			return m_eval->eval().c_str();
-		}
-	}
-	catch (...) {
-		// ignore
-	}
-	return what;
-}

src/lib/arch/XArch.h

@@ -55,26 +55,15 @@ string for that error code.
 */
 class XArchEval {
 public:
-	XArchEval() { }
-	virtual ~XArchEval() { }
-
-	virtual XArchEval*	clone() const throw() = 0;
-
-	virtual std::string	eval() const throw() = 0;
+	virtual std::string	eval() const = 0;
 };
 
 //! Generic exception architecture dependent library
 class XArch : public std::runtime_error {
 public:
-	XArch(XArchEval* adoptedEvaluator) : std::runtime_error(""), m_eval(adoptedEvaluator) { }
-	XArch(const std::string& msg) : std::runtime_error(msg), m_eval(NULL) { }
-	XArch(const XArch& e) : std::runtime_error(e.what()), m_eval(e.m_eval != NULL ? e.m_eval->clone() : NULL) { }
-	~XArch() _NOEXCEPT { delete m_eval; }
-
-	virtual const char* what() const _NOEXCEPT;
-
-private:
-	XArchEval*			m_eval;
+	XArch(XArchEval* adopted) : std::runtime_error(adopted->eval()) { delete adopted; }
+	XArch(const std::string& msg) : std::runtime_error(msg) { }
+	~XArch() _NOEXCEPT { }
 };
 
 // Macro to declare XArch derived types

src/lib/arch/unix/XArchUnix.cpp

@@ -24,12 +24,6 @@
 // XArchEvalUnix
 //
 
-XArchEval*
-XArchEvalUnix::clone() const throw()
-{
-	return new XArchEvalUnix(m_errno);
-}
-
 std::string
 XArchEvalUnix::eval() const throw()
 {

src/lib/arch/unix/XArchUnix.h

@@ -23,13 +23,11 @@
 //! Lazy error message string evaluation for unix
 class XArchEvalUnix : public XArchEval {
 public:
-	XArchEvalUnix(int err) : m_errno(err) { }
+	XArchEvalUnix(int error) : m_error(error) { }
 	virtual ~XArchEvalUnix() { }
 
-	// XArchEval overrides
-	virtual XArchEval*	clone() const throw();
-	virtual std::string	eval() const throw();
+	virtual std::string	eval() const;
 
 private:
-	int					m_errno;
+	int					m_error;
 };

src/lib/arch/win32/XArchWindows.cpp

@@ -18,17 +18,12 @@
 
 #include "arch/win32/XArchWindows.h"
 #include "arch/win32/ArchNetworkWinsock.h"
+#include "base/String.h"
 
 //
 // XArchEvalWindows
 //
 
-XArchEval*
-XArchEvalWindows::clone() const throw()
-{
-	return new XArchEvalWindows(m_errno);
-}
-
 std::string
 XArchEvalWindows::eval() const throw()
 {
@@ -37,13 +32,13 @@ XArchEvalWindows::eval() const throw()
 							FORMAT_MESSAGE_IGNORE_INSERTS |
 							FORMAT_MESSAGE_FROM_SYSTEM,
 							0,
-							m_errno,
+							m_error,
 							MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 							(LPTSTR)&cmsg,
 							0,
 							NULL) == 0) {
 		cmsg = NULL;
-		return "Unknown error";
+		return string_format("Unknown error, code %d", m_error);
 	}
 	std::string smsg(cmsg);
 	LocalFree(cmsg);
@@ -55,12 +50,6 @@ XArchEvalWindows::eval() const throw()
 // XArchEvalWinsock
 //
 
-XArchEval*
-XArchEvalWinsock::clone() const throw()
-{
-	return new XArchEvalWinsock(m_errno);
-}
-
 std::string
 XArchEvalWinsock::eval() const throw()
 {
@@ -123,7 +112,7 @@ XArchEvalWinsock::eval() const throw()
 	};
 
 	for (unsigned int i = 0; s_netErrorCodes[i].m_code != 0; ++i) {
-		if (s_netErrorCodes[i].m_code == m_errno) {
+		if (s_netErrorCodes[i].m_code == m_error) {
 			return s_netErrorCodes[i].m_msg;
 		}
 	}

src/lib/arch/win32/XArchWindows.h

@@ -26,28 +26,24 @@
 //! Lazy error message string evaluation for windows
 class XArchEvalWindows : public XArchEval {
 public:
-	XArchEvalWindows() : m_errno(GetLastError()) { }
-	XArchEvalWindows(DWORD err) : m_errno(err) { }
+	XArchEvalWindows() : m_error(GetLastError()) { }
+	XArchEvalWindows(DWORD error) : m_error(error) { }
 	virtual ~XArchEvalWindows() { }
 
-	// XArchEval overrides
-	virtual XArchEval*	clone() const throw();
-	virtual std::string	eval() const throw();
+	virtual std::string	eval() const;
 
 private:
-	DWORD				m_errno;
+	DWORD				m_error;
 };
 
 //! Lazy error message string evaluation for winsock
 class XArchEvalWinsock : public XArchEval {
 public:
-	XArchEvalWinsock(int err) : m_errno(err) { }
+	XArchEvalWinsock(int error) : m_error(error) { }
 	virtual ~XArchEvalWinsock() { }
 
-	// XArchEval overrides
-	virtual XArchEval*	clone() const throw();
-	virtual std::string	eval() const throw();
+	virtual std::string	eval() const;
 
 private:
-	int					m_errno;
+	int					m_error;
 };

src/lib/base/String.cpp

@@ -17,6 +17,9 @@
 
 #include "base/String.h"
 
+#include <memory>
+#include <cstdarg>
+
 void
 find_replace_all(
 	CString& subject,
@@ -29,3 +32,34 @@ find_replace_all(
          pos += replace.length();
     }
 }
+
+CString
+string_format(const CString format, ...)
+{
+	// reserve 2 times as much as the length of the format
+    size_t final, n = format.size() * 2;
+
+    CString str;
+    std::unique_ptr<char[]> formatted;
+    va_list ap;
+
+    while (true) {
+        
+		// wrap the plain char array in unique_ptr
+		formatted.reset(new char[n]);
+
+        strcpy(&formatted[0], format.c_str());
+        va_start(ap, format);
+        final = vsnprintf(&formatted[0], n, format.c_str(), ap);
+        va_end(ap);
+
+        if (final < 0 || final >= n) {
+            n += abs(static_cast<int>(final - n + 1));
+		}
+		else {
+            break;
+		}
+    }
+
+    return CString(formatted.get());
+}

src/lib/base/String.h

@@ -25,3 +25,4 @@
 typedef std::string CString;
 
 void find_replace_all(CString& subject, const CString& find, const CString& replace);
+CString string_format(const CString format, ...);