Main: Exception - avoid referencing dangling strings

hence directly resolve fullDesc

Author: paroj

OgreMain/include/OgreException.h

@@ -99,7 +99,7 @@ namespace Ogre {
         String description;
         String source;
         const char* file;
-        mutable String fullDesc; // storage for char* returned by what()
+        String fullDesc; // storage for char* returned by what()
     public:
         /** Static definitions of error codes.
             @todo
@@ -145,7 +145,7 @@ namespace Ogre {
                 the place in which OGRE found the problem, and a text
                 description from the 3D rendering library, if available.
         */
-        virtual const String& getFullDescription(void) const;
+        const String& getFullDescription(void) const { return fullDesc; }
 
         /** Gets the source function.
         */
@@ -166,7 +166,7 @@ namespace Ogre {
         const String &getDescription(void) const { return description; }
 
         /// Override std::exception::what
-        const char* what() const throw() { return getFullDescription().c_str(); }
+        const char* what() const throw() { return fullDesc.c_str(); }
 
     };
 

OgreMain/src/OgreException.cpp

@@ -34,9 +34,7 @@ THE SOFTWARE.
 namespace Ogre {
 
     Exception::Exception(int num, const String& desc, const String& src) :
-        line( 0 ),
-        description( desc ),
-        source( src )
+        Exception(num, desc, src, "", "", 0)
     {
     }
 
@@ -48,6 +46,18 @@ namespace Ogre {
         source( src ),
         file( fil )
     {
+        StringStream ss;
+
+        ss << typeName << ": "
+           << description
+           << " in " << source;
+
+        if( line > 0 )
+        {
+            ss << " at " << file << " (line " << line << ")";
+        }
+
+        fullDesc = ss.str();
     }
 
     Exception::Exception(const Exception& rhs)
@@ -58,28 +68,5 @@ namespace Ogre {
         file( rhs.file )
     {
     }
-
-    const String& Exception::getFullDescription(void) const
-    {
-        if (fullDesc.empty())
-        {
-
-            StringStream desc;
-
-            desc << typeName << ": "
-                << description 
-                << " in " << source;
-
-            if( line > 0 )
-            {
-                desc << " at " << file << " (line " << line << ")";
-            }
-
-            fullDesc = desc.str();
-        }
-
-        return fullDesc;
-    }
-
 }
 

RenderSystems/Direct3D11/include/OgreD3D11Prerequisites.h

@@ -145,16 +145,13 @@ namespace Ogre
         int hresult;
     public:
         D3D11RenderingAPIException(int hr, const String& inDescription, const String& inSource, const char* inFile, long inLine)
-            : RenderingAPIException(hr, inDescription, inSource, inFile, inLine), hresult(hr) {}
-
-        int getHResult() const { return hresult; }
-
-        const String& getFullDescription(void) const {
+            : RenderingAPIException(hr, inDescription, inSource, inFile, inLine), hresult(hr) {
             StringStream ss;
-            ss << RenderingAPIException::getFullDescription() << " HRESULT=0x" << std::hex << hresult;
+            ss << fullDesc << " HRESULT=0x" << std::hex << hresult;
             fullDesc = ss.str();
-            return fullDesc;
         }
+
+        int getHResult() const { return hresult; }
     };
 }
 #endif