For functions that return char*'s, don't return a c_str() of an

std::string, since as soon as the function returns, the std::string goes 
out of scope, and the c_str() becomes a dangling pointer, which usually 
points to the same area as before, but occasionally points to garbage.  
Instead, make them return std::string's, and call c_str() on the return 
value outside the functions.  Among other things, this should fix 
[1999515].

Note that I've only fixed direct c_str() returns for now.  There might 
be some indirect ones that I missed.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6139 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 2 deletions

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index c16b6427f3..9891bf14ad 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -118,12 +118,12 @@ const std::string cols[16] =
     "lightred", "lightmagenta", "yellow", "white"
 };
 
-const char* colour_to_str(unsigned char colour)
+const std::string colour_to_str(unsigned char colour)
 {
     if ( colour >= 16 )
         return "lightgrey";
     else
-        return cols[colour].c_str();
+        return cols[colour];
 }
 
 // Returns -1 if unmatched else returns 0-15.