1 files changed, 9 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index ed48be648bca..285d1241a2d5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -30,6 +30,7 @@
 
 #include "share.hxx"
 #include <stdio.h>
+#include <typeinfo>
 
 using namespace ::com::sun::star::uno;
 
@@ -565,7 +566,7 @@ void bridges::cpp_uno::shared::VtableFactory::flushCode(unsigned char const *, u
 {
 }
 
-struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; };
+struct bridges::cpp_uno::shared::VtableFactory::Slot { void const * fn; };
 
 bridges::cpp_uno::shared::VtableFactory::Slot *
 bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
@@ -579,6 +580,12 @@ std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
     return (slotCount + 2) * 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,
@@ -586,7 +593,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
 {
     Slot * slots = mapBlockToVtable(block);
     slots[-2].fn = 0;
-    slots[-1].fn = 0;
+    slots[-1].fn = &typeid(ProxyRtti);
     return slots + slotCount;
 }