UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Factor guts of _LoadPlugin into a separate function.

Browse Source
This commit is contained in:
David Anderson 2015-09-16 21:12:22 -07:00
parent 76d681761d
commit d5d7e8c9cf
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/logic/PluginSys.cpp
View File

@ -924,23 +924,11 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **aResult, const char *path, bool de
}
}
pPlugin = CPlugin::CreatePlugin(path, error, maxlength);
assert(pPlugin != NULL);
CPlugin *plugin = CompileAndPrep(path, error, maxlength);
if (pPlugin->m_status == Plugin_Uncompiled) {
pPlugin->TryCompile(error, maxlength);
}
if (pPlugin->m_status == Plugin_Created) {
MalwareCheckPass(pPlugin, error, maxlength);
}
LoadRes loadFailure = LoadRes_Failure;
/* Get the status */
if (pPlugin->GetStatus() == Plugin_Created)
{
/* First native pass - add anything from Core */
g_ShareSys.BindNativesToPlugin(pPlugin, true);
pPlugin->InitIdentity();
if (pPlugin->GetStatus() == Plugin_Created) {
APLRes result = pPlugin->Call_AskPluginLoad(error, maxlength);
switch (result)
{
@ -1242,6 +1230,28 @@ bool CPluginManager::LoadOrRequireExtensions(CPlugin *pPlugin, unsigned int pass
return true;
}
CPlugin *CPluginManager::CompileAndPrep(const char *path, char *error, size_t maxlength)
{
CPlugin *plugin = CPlugin::CreatePlugin(path, error, maxlength);
if (plugin->GetStatus() != Plugin_Uncompiled) {
assert(plugin->GetStatus() == Plugin_BadLoad);
return plugin;
}
if (!plugin->TryCompile(error, maxlength))
return plugin;
assert(plugin->GetStatus() == Plugin_Created);
if (!MalwareCheckPass(plugin, error, maxlength))
return false;
assert(plugin->GetStatus() == Plugin_Created);
g_ShareSys.BindNativesToPlugin(plugin, true);
plugin->InitIdentity();
return plugin;
}
bool CPluginManager::MalwareCheckPass(CPlugin *pPlugin, char *error, size_t maxlength)
{
unsigned char *pCodeHash = pPlugin->GetRuntime()->GetCodeHash();

1
core/logic/PluginSys.h
View File

@ -462,6 +462,7 @@ private:
/**
* First pass for loading a plugin, and its helpers.
*/
CPlugin *CompileAndPrep(const char *path, char *error, size_t maxlength);
bool MalwareCheckPass(CPlugin *pPlugin, char *error, size_t maxlength);
/**