Skip to content

Fix standalone crash when client disconnects before mission loads #7355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chief1983 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix standalone crash when client disconnects before mission loads #7355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions code/network/multi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1671,8 +1671,13 @@ void multi_standalone_reset_all()
// NETLOG
ml_string(NOX("Standalone resetting"));

// shut all game stuff down
game_level_close();
// shut all game stuff down -- but only if a mission was actually in progress,
// otherwise scripting hooks in game_level_close() may fire into uninitialized
// subsystems (e.g. SEXP nodes never allocated because no mission was loaded)
if (Game_mode & GM_IN_MISSION) {
game_level_close();
Game_mode &= ~GM_IN_MISSION;
}

// reinitialize the gui
std_reset_standalone_gui();
Expand Down
15 changes: 15 additions & 0 deletions code/scripting/api/libs/mission.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,11 @@ ADE_FUNC(evaluateSEXP, l_Mission, "string", "Runs the defined SEXP script, and r
if(!ade_get_args(L, "s", &s))
return ADE_RETURN_FALSE;

if (Sexp_nodes == nullptr) {
Warning(LOCATION, "evaluateSEXP called before SEXP system initialized; returning false");
return ADE_RETURN_FALSE;
}

r_val = run_sexp(s);

if (r_val == SEXP_TRUE)
Expand All @@ -218,6 +223,11 @@ ADE_FUNC(evaluateNumericSEXP, l_Mission, "string", "Runs the defined SEXP script
if (!ade_get_args(L, "s", &s))
return ade_set_args(L, "i", 0);

if (Sexp_nodes == nullptr) {
Warning(LOCATION, "evaluateNumericSEXP called before SEXP system initialized; returning NaN");
return ade_set_args(L, "f", std::numeric_limits<float>::quiet_NaN());
}

r_val = run_sexp(s, true, &got_nan);

if (got_nan)
Expand All @@ -235,6 +245,11 @@ ADE_FUNC(runSEXP, l_Mission, "string", "Runs the defined SEXP script within a `w
if(!ade_get_args(L, "s", &s))
return ADE_RETURN_FALSE;

if (Sexp_nodes == nullptr) {
Warning(LOCATION, "runSEXP called before SEXP system initialized; returning false");
return ADE_RETURN_FALSE;
}

while (is_white_space(*s))
s++;
if (*s != '(')
Expand Down
Loading