summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-02 05:41:39 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-02 05:42:28 +0530
commit2bd7c49b579df905f1fe4d880051716d6649aaf8 (patch)
tree2c32a231c1f7a4b263fbff4caa223a2171a6cb57 /crawl-ref/source
parenta9f4df1bf8210a3209d8c89e4543d429a1befcad (diff)
downloadcrawl-ref-2bd7c49b579df905f1fe4d880051716d6649aaf8.tar.gz
crawl-ref-2bd7c49b579df905f1fe4d880051716d6649aaf8.zip
[Mantis 299] Fix door-blocking messages using pointer into freed memory (syllogism).
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/main.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 1cde79095b..2d64a7aa6f 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -3613,7 +3613,8 @@ static void _close_door(coord_def move)
find_connected_identical(doorpos, grd(doorpos), all_door);
const char *adj, *noun;
get_door_description(all_door.size(), &adj, &noun);
- const char *waynoun = make_stringf("%sway", noun).c_str();
+ const std::string waynoun_str = make_stringf("%sway", noun);
+ const char *waynoun = waynoun_str.c_str();
const std::string door_desc_adj =
env.markers.property_at(doorpos, MAT_ANY,