zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed potential crashes in Linux crash reporter

Browse source 
Do not access various global objects at early stage of initialization and late stage of shutdown
This commit is contained in:
alexey.lysiuk 2019-10-11 12:01:36 +03:00
parent 08a66abde9
commit 279b327c6c
1 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/posix/sdl/i_main.cpp
View file

@ -102,39 +102,47 @@ static int DoomSpecificInfo (char *buffer, char *end)
#ifdef __VERSION__ #ifdef __VERSION__
p += snprintf (buffer+p, size-p, "Compiler version: %s\n", __VERSION__); p += snprintf (buffer+p, size-p, "Compiler version: %s\n", __VERSION__);
#endif #endif
p += snprintf (buffer+p, size-p, "\nCommand line:");
for (i = 0; i < Args->NumArgs(); ++i)
{
p += snprintf (buffer+p, size-p, " %s", Args->GetArg(i));
}
p += snprintf (buffer+p, size-p, "\n");
for (i = 0; (arg = Wads.GetWadName (i)) != NULL; ++i)
{
p += snprintf (buffer+p, size-p, "\nWad %d: %s", i, arg);
}
if (gamestate != GS_LEVEL && gamestate != GS_TITLELEVEL) // If Args is nullptr, then execution is at either
// * early stage of initialization, additional info contains only default values
// * late stage of shutdown, most likely main() was done, and accessing global variables is no longer safe
if (Args)
{ {
p += snprintf (buffer+p, size-p, "\n\nNot in a level."); p += snprintf(buffer + p, size - p, "\nCommand line:");
} for (i = 0; i < Args->NumArgs(); ++i)
else
{
p += snprintf (buffer+p, size-p, "\n\nCurrent map: %s", primaryLevel->MapName.GetChars());
if (!viewactive)
{ {
p += snprintf (buffer+p, size-p, "\n\nView not active."); p += snprintf(buffer + p, size - p, " %s", Args->GetArg(i));
}
p += snprintf(buffer + p, size - p, "\n");
for (i = 0; (arg = Wads.GetWadName(i)) != NULL; ++i)
{
p += snprintf(buffer + p, size - p, "\nWad %d: %s", i, arg);
}
if (gamestate != GS_LEVEL && gamestate != GS_TITLELEVEL)
{
p += snprintf(buffer + p, size - p, "\n\nNot in a level.");
} }
else else
{ {
auto &vp = r_viewpoint; p += snprintf(buffer + p, size - p, "\n\nCurrent map: %s", primaryLevel->MapName.GetChars());
p += snprintf (buffer+p, size-p, "\n\nviewx = %f", vp.Pos.X);
p += snprintf (buffer+p, size-p, "\nviewy = %f", vp.Pos.Y); if (!viewactive)
p += snprintf (buffer+p, size-p, "\nviewz = %f", vp.Pos.Z); {
p += snprintf (buffer+p, size-p, "\nviewangle = %f", vp.Angles.Yaw.Degrees); p += snprintf(buffer + p, size - p, "\n\nView not active.");
}
else
{
auto& vp = r_viewpoint;
p += snprintf(buffer + p, size - p, "\n\nviewx = %f", vp.Pos.X);
p += snprintf(buffer + p, size - p, "\nviewy = %f", vp.Pos.Y);
p += snprintf(buffer + p, size - p, "\nviewz = %f", vp.Pos.Z);
p += snprintf(buffer + p, size - p, "\nviewangle = %f", vp.Angles.Yaw.Degrees);
}
} }
} }
buffer[p++] = '\n'; buffer[p++] = '\n';
buffer[p++] = '\0'; buffer[p++] = '\0';