Skip to content

Commit

Permalink
Revert "plugins: do not pass potentially destroyed data to unload cal…
Browse files Browse the repository at this point in the history
…lback"

This reverts commit 0252408.
  • Loading branch information
kugel- committed Oct 5, 2015
1 parent efc4f78 commit 90c905a
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/plugins.c
Expand Up @@ -948,10 +948,7 @@ plugin_free(Plugin *plugin)
/* cb_data_destroy might be plugin code and must be called before unloading the module. */
if (plugin->cb_data_destroy)
plugin->cb_data_destroy(plugin->cb_data);

/* If cb_data was destroyed above then we must not pass it to unload(). */
proxy->proxy_cbs.unload(&proxy->public, &plugin->public, plugin->proxy_data,
plugin->cb_data_destroy ? NULL: proxy->cb_data);
proxy->proxy_cbs.unload(&proxy->public, &plugin->public, plugin->proxy_data, proxy->cb_data);

g_free(plugin->filename);
g_free(plugin);
Expand Down

0 comments on commit 90c905a

Please sign in to comment.