summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/plugins/newplugins.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index 6c142d852e..035b2e4c63 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -186,20 +186,13 @@ static const TCHAR* expiredModulesToSkip[] =
static int checkPI(BASIC_PLUGIN_INFO* bpi, PLUGININFOEX* pi)
{
- int bHasValidInfo = FALSE;
-
if (pi == NULL)
return FALSE;
- if (bpi->InfoEx) {
- if (pi->cbSize == sizeof(PLUGININFOEX))
- if ( !validInterfaceList(bpi->Interfaces) || isPluginBanned(pi->uuid, pi->version))
- return FALSE;
-
- bHasValidInfo = TRUE;
- }
+ if (bpi->InfoEx == NULL || pi->cbSize != sizeof(PLUGININFOEX))
+ return FALSE;
- if ( !bHasValidInfo)
+ if ( !validInterfaceList(bpi->Interfaces) || isPluginBanned(pi->uuid, pi->version))
return FALSE;
if (pi->shortName == NULL || pi->description == NULL || pi->author == NULL ||