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

diff --git a/crawl-ref/source/macro.h b/crawl-ref/source/macro.h
index 1405cb7e19..35b2514a51 100644
--- a/crawl-ref/source/macro.h
+++ b/crawl-ref/source/macro.h
@@ -74,7 +74,7 @@ void macro_buf_add(const keyseq &actions, bool reverse = false );
 bool is_userfunction(int key);
 bool is_synthetic_key(int key);
 
-const char *get_userfunction(int key);
+std::string get_userfunction(int key);
 
 void add_key_recorder(key_recorder* recorder);
 void remove_key_recorder(key_recorder* recorder);