diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-07-07 10:15:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-07 10:48:25 +0100 |
| commit | 0d78ad871e85a74a2a7eac2f2a2ff94776f35e77 (patch) | |
| tree | a29ea7098cc49b1116db16f219bdc662e04ac874 /cppu/source/uno | |
| parent | 807b696c5c15dc2d8255116305fd28ba60f201c0 (diff) | |
DBG_ASSERT->assert when followed by dereference
Change-Id: Ic1c999ffdc391ea01be5711721e7c9e63179473e
Diffstat (limited to 'cppu/source/uno')
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 8 | ||||
| -rw-r--r-- | cppu/source/uno/lbmap.cxx | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index b2828209d45d..c38a9b7a2eb0 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -1006,7 +1006,7 @@ inline void EnvironmentsData::getRegisteredEnvironments( uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc, const OUString & rEnvDcp ) { - OSL_ENSURE( pppEnvs && pnLen && memAlloc, "### null ptr!" ); + assert(pppEnvs && pnLen && memAlloc && "### null ptr!"); // max size uno_Environment ** ppFound = (uno_Environment **)alloca( @@ -1144,7 +1144,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_createEnvironment( uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext ) SAL_THROW_EXTERN_C() { - OSL_ENSURE( ppEnv, "### null ptr!" ); + assert(ppEnv && "### null ptr!"); if (*ppEnv) (*(*ppEnv)->release)( *ppEnv ); @@ -1152,12 +1152,11 @@ CPPU_DLLPUBLIC void SAL_CALL uno_createEnvironment( *ppEnv = initDefaultEnvironment( rEnvDcp, pContext ); } - CPPU_DLLPUBLIC void SAL_CALL uno_getEnvironment( uno_Environment ** ppEnv, rtl_uString * pEnvDcp, void * pContext ) SAL_THROW_EXTERN_C() { - OSL_ENSURE( ppEnv, "### null ptr!" ); + assert(ppEnv && "### null ptr!"); OUString const & rEnvDcp = OUString::unacquired( &pEnvDcp ); EnvironmentsData & rData = theEnvironmentsData::get(); @@ -1175,7 +1174,6 @@ CPPU_DLLPUBLIC void SAL_CALL uno_getEnvironment( } } - CPPU_DLLPUBLIC void SAL_CALL uno_getRegisteredEnvironments( uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc, rtl_uString * pEnvDcp ) diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 43c5d4af6e6f..162f438ceebe 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -631,7 +631,7 @@ void SAL_CALL uno_getMappingByName( rtl_uString * pAddPurpose ) SAL_THROW_EXTERN_C() { - OSL_ENSURE( ppMapping && pFrom && pTo, "### null ptr!" ); + assert(ppMapping && pFrom && pTo && "### null ptr!"); if (*ppMapping) { (*(*ppMapping)->release)( *ppMapping ); |