Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

segmentation fault caused by free'ing battles twice

This commit is contained in:
Enno Rehling 2014-12-12 17:21:04 +01:00
parent f7205251a3
commit b4e13b7cbd
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle.c
View File

@ -4272,7 +4272,6 @@ void do_battle(region * r)
message_all(b, m); message_all(b, m);
msg_release(m); msg_release(m);
free_battle(b); free_battle(b);
free(b);
return; return;
} }
join_allies(b); join_allies(b);
@ -4319,7 +4318,6 @@ void do_battle(region * r)
if (b) { if (b) {
free_battle(b); free_battle(b);
free(b);
} }
} }

2
src/build.h
View File

@ -1,3 +1,3 @@
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_BUILD 692 #define VERSION_BUILD 693