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, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/initfile.h b/crawl-ref/source/initfile.h
index b04b3f3850..f949f94fc8 100644
--- a/crawl-ref/source/initfile.h
+++ b/crawl-ref/source/initfile.h
@@ -26,9 +26,9 @@ enum drop_mode_type
 };
 
 god_type str_to_god(std::string god);
-int str_to_colour( const std::string &str, int default_colour = -1,
-                   bool accept_number = true );
-const char* colour_to_str( unsigned char colour );
+int str_to_colour(const std::string &str, int default_colour = -1,
+                  bool accept_number = true);
+const std::string colour_to_str(unsigned char colour);
 
 // last updated 12may2000 {dlb}
 /* ***********************************************************************