diff options
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx')
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index ddcd40818036..0d8303861c28 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -30,6 +30,7 @@ #include "share.hxx" #include <stdio.h> +#include <typeinfo> extern "C" { extern void (*privateSnippetExecutor)(); } @@ -607,10 +608,16 @@ std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize( return (slotCount + 1) * sizeof (Slot) + slotCount * codeSnippetSize; } +namespace { +// Some dummy type whose RTTI is used in the synthesized proxy vtables to make uses of dynamic_cast +// on such proxy objects not crash: +struct ProxyRtti {}; +} + bridges::cpp_uno::shared::VtableFactory::Slot* bridges::cpp_uno::shared::VtableFactory::initializeBlock(void * block, sal_Int32 slotCount, sal_Int32, typelib_InterfaceTypeDescription *) { Slot * slots = mapBlockToVtable(block); - slots[-1] = {0,0}; + slots[-1] = {0,reinterpret_cast<sal_uInt64>(&typeid(ProxyRtti))}; return slots + slotCount; } |