diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-25 19:47:37 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-25 19:47:37 +0000 |
commit | e3b9a7a1e14dd81cace9e2241679c5a92eba6006 (patch) | |
tree | e3f48acadb2eb14be1cd282b11496622be261e4a /crawl-ref/source/macro.h | |
parent | eef749ceb30bf5694dfe06646fde3f2493dc1fa0 (diff) | |
download | crawl-ref-e3b9a7a1e14dd81cace9e2241679c5a92eba6006.tar.gz crawl-ref-e3b9a7a1e14dd81cace9e2241679c5a92eba6006.zip |
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
Diffstat (limited to 'crawl-ref/source/macro.h')
-rw-r--r-- | crawl-ref/source/macro.h | 2 |
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); |