Changes in cpp_uno

b0062a7f186036726cccd32e304e680240861d88 - Make robust against __cxa_exception ABI changes

Sun, 08 Jun 2025 08:00:00 +0000

Make robust against __cxa_exception ABI changesPatch OpenOffice to replace __cxa_get_globals()->caughtExceptions,which is a pointer to the start of a struct __cxa_exception, with__cxa_current_primary_exception(), which is a pointer to the end. Thisallows struct __cxa_exception to be extended at the start as wasrecently done in FreeBSD main and stable/13 on 64-bit architectures.Recently on FreeBSD main and stable/13 __attribute__((__aligned__)) wasadded to struct _Unwind_Exception which changes its size on 32-bitarchitectures, and that of __cxa_exception as well. Patch openofficeto detect this so packages built on 13.0 still work on 13.1.(cherry picked from commit d10e4cc263102d760b56217974702c98f89327b0)(cherry picked from commit 3bfdfb5f4474009ab79d4e0a47aa68a4a684cbd6) List of files: /AOO41X/main/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx/AOO41X/main/bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx/AOO41X/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx

471ac2735853742a0649370d807274b46334350f - Tweak our declaration for __cxa_allocate_exception()

Sun, 08 Jun 2025 09:00:00 +0000

Tweak our declaration for __cxa_allocate_exception()Tweak our declaration for __cxa_allocate_exception() so that it matchesthe one that sometimes shows up in /usr/include/c++/v1/cxxabi.h. Clangnow treats the subtle differences as an error.(cherry picked from commit 2eea618918c0a834d288fbf460788a1c08389478)(cherry picked from commit 76cc68e7cb336cf6cd76c4de85e66ba9281a11cb) List of files: /AOO41X/main/bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx/AOO41X/main/bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx/AOO41X/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx/AOO41X/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx

ccdf8a5538941ccdf1bbcd656559403987847727 - Fix crash, uninitialized-return, and buffer bugs in update check and macOS x86 bridge

Mon, 08 Jun 2026 09:00:00 +0000

Fix crash, uninitialized-return, and buffer bugs in update check and macOS x86 bridgeupdateprotocol.cxx: guard XNodeList dereferences so a swallowedXPathException no longer leaves a null reference to be dereferenced(crash on malformed/hostile update descriptors); clear the list beforethe relnote query so a thrown exception can't leave us iterating theprevious (sources) node list.cpp2uno.cxx: the queryInterface fast-path guard used 'break', whichexited the switch and skipped the default case, returning anuninitialized typelib_TypeClass. Guard the block with'if (bHasHiddenReturn)' instead so control falls through to default andeRet is always assigned.updatecheck.cxx (getImageFromFileName): use bitwise '|' instead oflogical '||' when combining osl_Process flags; rewrite the trailingCR/LF trim so it never reads/writes before the start of the buffer(e.g. when osl_readFile returns 0 bytes).Co-Authored-By: Claude Opus 4.8 List of files: /AOO41X/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx

412f88f655568c92cc0aaf1226b59d5b1d539fda - Fix the macOS x86 bridge. Previous version was fragile.

Fri, 05 Jun 2026 14:00:00 +0000

Fix the macOS x86 bridge. Previous version was fragile. List of files: /AOO41X/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/uno2cpp.cxx