empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix prewrite callbacks' cargo list update for in-place update

Browse source 
When updating in-place (old==new), we must not write through new
before we're done reading the same memory through old.

Bug: we write the carrier uids too early.  Cargo lists aren't updated
when a carrier dies in an in-place update.  No such updates are known.
Broken in commit 64a53c90, v4.3.17.
This commit is contained in:
Markus Armbruster 2011-07-10 15:36:24 +02:00
parent 91c2ecec53
commit a8b7d1d017
3 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/lib/subs/nuke.c
View file

@ -29,7 +29,7 @@
* Known contributors to this file:
* Dave Pare, 1989
* Steve McClure, 1996
* Markus Armbruster, 2006-2008
* Markus Armbruster, 2006-2011
*/
#include <config.h>
@ -60,21 +60,24 @@ nuk_prewrite(int n, void *old, void *new)
struct nukstr *oldnp = old;
struct nukstr *np = new;
natid own = np->nuk_effic == 0 ? 0 : np->nuk_own;
int plane = np->nuk_plane;
/* Be careful with writing to *np, in case oldnp == np */
if (!own) {
np->nuk_effic = 0;
np->nuk_plane = -1;
plane = -1;
}
if (oldnp->nuk_plane != np->nuk_plane)
nuk_carrier_change(np, EF_PLANE, oldnp->nuk_plane, np->nuk_plane);
if (oldnp->nuk_plane != plane)
nuk_carrier_change(np, EF_PLANE, oldnp->nuk_plane, plane);
/* We've avoided assigning to np->nuk_own, in case oldnp == np */
if (oldnp->nuk_own != own)
lost_and_found(EF_NUKE, oldnp->nuk_own, own,
np->nuk_uid, np->nuk_x, np->nuk_y);
np->nuk_own = own;
np->nuk_plane = plane;
}
char *