]> git.pond.sub.org Git - empserver/commit
march: Fix concurrent updates at sector abandon prompt
authorMarkus Armbruster <armbru@pond.sub.org>
Sun, 29 Nov 2015 09:37:40 +0000 (10:37 +0100)
committerMarkus Armbruster <armbru@pond.sub.org>
Sat, 5 Dec 2015 12:19:38 +0000 (13:19 +0100)
commit863fde5a2c90cafbdbf5b5f181dba42723c3a82d
tree0a40549173948797794cf18a03e7f3a715b79c2e
parent8daeffbd8f5bd7d98939ffeacadbe3737b8ab7c7
march: Fix concurrent updates at sector abandon prompt

When the player declines to abandon a sector, we write back stale land
units, triggering a generation oops.  Any updates made by other
threads meanwhile are wiped out, triggering a seqno mismatch oops.

The culprit is lnd_abandon_askyn(): when the player declines, it
returns without calling check_sect_ok(), check_land_ok().  Broken in
commit 7c1b166, v4.3.33.  Fix it.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
src/lib/subs/lndsub.c
tests/navi-march/server.log