mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26819) -Fix [FS#6112] (r26787): trying to delete just loaded objects that had not yet resolved their references caused a crash upon savegame load (only when loading a game from a server, e.g. joining MP)

release/1.5
rubidium 2014-09-14 15:11:33 +00:00
parent 5a2fd3630b
commit 32c56b5f84
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/saveload/afterload.cpp
View File

@ -51,6 +51,7 @@
#include "../core/backup_type.hpp" #include "../core/backup_type.hpp"
#include "../smallmap_gui.h" #include "../smallmap_gui.h"
#include "../news_func.h" #include "../news_func.h"
#include "../order_backup.h"
#include "../error.h" #include "../error.h"
@ -2916,6 +2917,21 @@ bool AfterLoadGame()
} }
} }
/*
* Only keep order-backups for network clients.
* If we are a network server or not networking, then we just loaded a previously
* saved-by-server savegame. There are no clients with a backup, so clear it.
* Furthermore before savegame version 192 the actual content was always corrupt.
*/
if (!_networking || _network_server || IsSavegameVersionBefore(192)) {
/* Note: We cannot use CleanPool since that skips part of the destructor
* and then leaks un-reachable Orders in the order pool. */
OrderBackup *ob;
FOR_ALL_ORDER_BACKUPS(ob) {
delete ob;
}
}
/* Station acceptance is some kind of cache */ /* Station acceptance is some kind of cache */
if (IsSavegameVersionBefore(127)) { if (IsSavegameVersionBefore(127)) {

14
src/saveload/order_sl.cpp
View File

@ -295,20 +295,6 @@ void Load_BKOR()
OrderBackup *ob = new (index) OrderBackup(); OrderBackup *ob = new (index) OrderBackup();
SlObject(ob, GetOrderBackupDescription()); SlObject(ob, GetOrderBackupDescription());
} }
/* Only load order-backups for network clients.
* If we are a network server or not networking, then we just loaded a previously
* saved-by-server savegame. There are no clients with a backup, so clear it.
* Furthermore before savegame version 192 the actual content was always corrupt.
*/
if (!_networking || _network_server || IsSavegameVersionBefore(192)) {
/* Note: We cannot use CleanPool since that skips part of the destructor
* and then leaks un-reachable Orders in the order pool. */
OrderBackup *ob;
FOR_ALL_ORDER_BACKUPS(ob) {
delete ob;
}
}
} }
static void Ptrs_BKOR() static void Ptrs_BKOR()