Bug 58221 don't use strlen to check if a string is of length 0
patch by aaronl@vitelus.com r=timeless sr=bz git-svn-id: svn://10.0.0.236/trunk@133999 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -126,28 +126,28 @@ CPlugin::CPlugin(HINSTANCE hInst,
|
||||
assert(m_hInst != NULL);
|
||||
assert(m_pNPInstance != NULL);
|
||||
|
||||
if((pluginType != NULL) && (lstrlen((LPSTR)pluginType) != 0))
|
||||
if(pluginType && *pluginType)
|
||||
{
|
||||
m_pNPMIMEType = (NPMIMEType)new char[lstrlen((LPSTR)pluginType) + 1];
|
||||
if(m_pNPMIMEType != NULL)
|
||||
lstrcpy((LPSTR)m_pNPMIMEType, pluginType);
|
||||
}
|
||||
|
||||
if((szPageURL != NULL) && (lstrlen(szPageURL) != 0))
|
||||
if(szPageURL && *szPageURL)
|
||||
{
|
||||
m_szPageURL = new char[lstrlen(szPageURL) + 1];
|
||||
if(m_szPageURL != NULL)
|
||||
lstrcpy(m_szPageURL, szPageURL);
|
||||
}
|
||||
|
||||
if((szFileURL != NULL) && (lstrlen(szFileURL) != 0))
|
||||
if(szFileURL && *szFileURL)
|
||||
{
|
||||
m_szFileURL = new char[lstrlen(szFileURL) + 1];
|
||||
if(m_szFileURL != NULL)
|
||||
lstrcpy(m_szFileURL, szFileURL);
|
||||
}
|
||||
|
||||
if((szFileExtension != NULL) && (lstrlen(szFileExtension) != 0))
|
||||
if(szFileExtension && *szFileExtension)
|
||||
{
|
||||
m_szFileExtension = new char[lstrlen(szFileExtension) + 1];
|
||||
if(m_szFileExtension != NULL)
|
||||
@@ -158,7 +158,7 @@ CPlugin::CPlugin(HINSTANCE hInst,
|
||||
|
||||
char szString[1024] = {'\0'};
|
||||
LoadString(m_hInst, IDS_CLICK_TO_GET, szString, sizeof(szString));
|
||||
if(lstrlen(szString) != 0)
|
||||
if(*szString)
|
||||
{
|
||||
m_szCommandMessage = new char[lstrlen(szString) + 1];
|
||||
if(m_szCommandMessage != NULL)
|
||||
@@ -453,7 +453,7 @@ void CPlugin::getPluginSmart()
|
||||
|
||||
dbgOut3("%#08x '%s'", m_pNPInstance, szJSString);
|
||||
|
||||
assert(lstrlen(szJSString) > 0);
|
||||
assert(*szJSString);
|
||||
|
||||
NPN_GetURL(m_pNPInstance, szJSString, "smartupdate_plugin_finder");
|
||||
*/
|
||||
@@ -507,7 +507,7 @@ void CPlugin::getPlugin()
|
||||
|
||||
char szString[1024] = {'\0'};
|
||||
LoadString(m_hInst, IDS_CLICK_WHEN_DONE, szString, sizeof(szString));
|
||||
if(lstrlen(szString) != 0)
|
||||
if(*szString)
|
||||
{
|
||||
m_szCommandMessage = new char[lstrlen(szString) + 1];
|
||||
if(m_szCommandMessage != NULL)
|
||||
|
||||
Reference in New Issue
Block a user