Kaydet (Commit) 58abc742 authored tarafından Mike Kaganski's avatar Mike Kaganski

tdf#120703 (PVS): redundant nullptr checks

V668 There is no sense in testing the 'm_pScriptSubPackageIterator' pointer
     against null, as the memory was allocated using the 'new' operator. The
     exception will be generated in the case of memory allocation error.

Change-Id: I15e635a6c9420ff444c5998dc0dbbf6f74ca6644
Reviewed-on: https://gerrit.libreoffice.org/62126
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 3d0559e4
......@@ -3355,15 +3355,12 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextUserScript
m_pScriptSubPackageIterator = new ScriptSubPackageIterator( xPackage );
}
if( m_pScriptSubPackageIterator != nullptr )
xScriptPackage = m_pScriptSubPackageIterator->getNextScriptSubPackage( rbPureDialogLib );
if( !xScriptPackage.is() )
{
xScriptPackage = m_pScriptSubPackageIterator->getNextScriptSubPackage( rbPureDialogLib );
if( !xScriptPackage.is() )
{
delete m_pScriptSubPackageIterator;
m_pScriptSubPackageIterator = nullptr;
m_iUserPackage++;
}
delete m_pScriptSubPackageIterator;
m_pScriptSubPackageIterator = nullptr;
m_iUserPackage++;
}
}
......@@ -3409,15 +3406,12 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri
m_pScriptSubPackageIterator = new ScriptSubPackageIterator( xPackage );
}
if( m_pScriptSubPackageIterator != nullptr )
xScriptPackage = m_pScriptSubPackageIterator->getNextScriptSubPackage( rbPureDialogLib );
if( !xScriptPackage.is() )
{
xScriptPackage = m_pScriptSubPackageIterator->getNextScriptSubPackage( rbPureDialogLib );
if( !xScriptPackage.is() )
{
delete m_pScriptSubPackageIterator;
m_pScriptSubPackageIterator = nullptr;
m_iSharedPackage++;
}
delete m_pScriptSubPackageIterator;
m_pScriptSubPackageIterator = nullptr;
m_iSharedPackage++;
}
}
......@@ -3463,15 +3457,12 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextBundledScr
m_pScriptSubPackageIterator = new ScriptSubPackageIterator( xPackage );
}
if( m_pScriptSubPackageIterator != nullptr )
xScriptPackage = m_pScriptSubPackageIterator->getNextScriptSubPackage( rbPureDialogLib );
if( !xScriptPackage.is() )
{
xScriptPackage = m_pScriptSubPackageIterator->getNextScriptSubPackage( rbPureDialogLib );
if( !xScriptPackage.is() )
{
delete m_pScriptSubPackageIterator;
m_pScriptSubPackageIterator = nullptr;
m_iBundledPackage++;
}
delete m_pScriptSubPackageIterator;
m_pScriptSubPackageIterator = nullptr;
m_iBundledPackage++;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment