From b4e13b7cbd31b54aba9db159973b06c012ceb9ee Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 12 Dec 2014 17:21:04 +0100 Subject: [PATCH] segmentation fault caused by free'ing battles twice --- src/battle.c | 2 -- src/build.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/battle.c b/src/battle.c index e7676d990..aca693478 100644 --- a/src/battle.c +++ b/src/battle.c @@ -4272,7 +4272,6 @@ void do_battle(region * r) message_all(b, m); msg_release(m); free_battle(b); - free(b); return; } join_allies(b); @@ -4319,7 +4318,6 @@ void do_battle(region * r) if (b) { free_battle(b); - free(b); } } diff --git a/src/build.h b/src/build.h index 6aab71634..78d54c0d4 100644 --- a/src/build.h +++ b/src/build.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 3 -#define VERSION_BUILD 692 +#define VERSION_BUILD 693