From cd648264d00177867a58ed5794dc0e9631e40f23 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 3 Jul 2012 22:17:52 +0000 Subject: fix for the PLUGININFOEX size check git-svn-id: http://svn.miranda-ng.org/main/trunk@746 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/plugins/newplugins.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src') 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 || -- cgit v1.2.3