From 152dc613483672b8535c9095e24bf0d18104ec45 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 31 Aug 2015 22:36:45 +0100 Subject: Fix exception message corruption. Using the c_str() of a std::string after the string has been freed is unsafe and can lead to corrupted error messages in tests, or worse. --- lib/common/makeexception.pl.in | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'lib/common/makeexception.pl.in') diff --git a/lib/common/makeexception.pl.in b/lib/common/makeexception.pl.in index e4018180..498c81b8 100755 --- a/lib/common/makeexception.pl.in +++ b/lib/common/makeexception.pl.in @@ -117,6 +117,7 @@ print H <<__E; private: unsigned int mSubType; std::string mMessage; + std::string mWhat; }; #endif // $guardname @@ -190,21 +191,15 @@ unsigned int ${class}Exception::GetSubType() const throw() const char * ${class}Exception::what() const throw() { - std::string what = "${class}"; - -#ifdef EXCEPTION_CODENAMES_EXTENDED - if(mSubType < (sizeof(whats) / sizeof(whats[0]))) - { - what = whats[mSubType]; - } -#endif + // We need to use a string that will persist after this function exits. + mWhat = GetMessage(mSubType); if(mMessage != "") { - what += ": " + mMessage; + mWhat += ": " + mMessage; } - return what.c_str(); + return mWhat.c_str(); } const char * ${class}Exception::GetMessage(int SubType) -- cgit v1.2.3