qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[plugin] Pull plugin from list before calling its shutdown 

This ensures that the plugin's shutdown function won't get called twice
in the event of an error in the plugin's unload sequence triggering a
second Sys_Shutdown, especially if the plugin is being unloaded as a
part of another sub-system's shutdown sequence (which is probably in
itself a design mistake, need to look into that).
This commit is contained in:
Bill Currie 2022-05-13 09:50:24 +09:00
parent 3823ea1858
commit 0dca1e1124
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/util/plugin.c
View File

@ -396,6 +396,11 @@ PI_LoadPlugin (const char *type, const char *name)
VISIBLE qboolean
PI_UnloadPlugin (plugin_t *plugin)
{
// Remove the plugin from the set of loaded plugins to ensure that a
// shutdown triggered by an error in the unload process doesn't try to
// unload the plugin a second time
loaded_plugin_t *lp = Hash_Del (loaded_plugins, plugin->full_name);
if (plugin && plugin->functions && plugin->functions->general
&& plugin->functions->general->shutdown) {
plugin->functions->general->shutdown ();
@ -405,8 +410,7 @@ PI_UnloadPlugin (plugin_t *plugin)
plugin->type);
}
// remove from the table of loaded plugins
Hash_Free (loaded_plugins, Hash_Del (loaded_plugins, plugin->full_name));
Hash_Free (loaded_plugins, lp);
if (!plugin->handle) // we didn't load it
return true;