Author: hdu
Date: Thu Dec 12 09:23:56 2013
New Revision: 1550381
URL: http://svn.apache.org/r1550381
Log:
#i122195# fix leak when handling exceptions in the UNO bridge for OSX 64bit
Modified:
openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
Modified:
openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx?rev=1550381&r1=1550380&r2=1550381&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
(original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
Thu Dec 12 09:23:56 2013
@@ -213,8 +213,6 @@ type_info * RTTI::getRTTI( typelib_Compo
static void deleteException( void * pExc )
{
__cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
- if( !header->exceptionType) // TODO: remove this when getRTTI() always
returns non-NULL
- return; // NOTE: leak for now
typelib_TypeDescription * pTD = 0;
OUString unoName( toUNOname( header->exceptionType->name() ) );
::typelib_typedescription_getByName( &pTD, unoName.pData );
Modified:
openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx?rev=1550381&r1=1550380&r2=1550381&view=diff
==============================================================================
--- openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
(original)
+++ openoffice/trunk/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
Thu Dec 12 09:23:56 2013
@@ -40,7 +40,7 @@ struct _Unwind_Exception
void * exception_cleanup;
uintptr_t private_1;
uintptr_t private_2;
-} __attribute__((__aligned__));
+};
struct __cxa_exception
{
