mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*ppRet cannot become non-null there out of thin air

Browse Source 
Change-Id: Idd08a89dd0dcf05caeacc9e14a0a6ea10b433588
This commit is contained in:
Stephan Bergmann 2013-03-05 21:20:25 +01:00
parent ef8a6be49a
commit f4b218d164
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cppu/source/typelib/typelib.cxx
View File

@ -23,6 +23,7 @@
#endif #endif
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <cassert>
#include <list> #include <list>
#include <set> #include <set>
#include <vector> #include <vector>
@ -250,6 +251,8 @@ inline void TypeDescriptor_Init_Impl::callChain(
typelib_TypeDescription ** ppRet, rtl_uString * pName ) typelib_TypeDescription ** ppRet, rtl_uString * pName )
SAL_THROW(()) SAL_THROW(())
{ {
assert(ppRet != 0);
assert(*ppRet == 0);
if (pCallbacks) if (pCallbacks)
{ {
CallbackSet_Impl::const_iterator aIt = pCallbacks->begin(); CallbackSet_Impl::const_iterator aIt = pCallbacks->begin();
@ -262,11 +265,6 @@ inline void TypeDescriptor_Init_Impl::callChain(
++aIt; ++aIt;
} }
} }
if (*ppRet)
{
typelib_typedescription_release( *ppRet );
*ppRet = 0;
}
} }
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________