mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure RTTI symbol visibility for Linux Clang -fsanitize=function,vptr

Browse Source 
The problem being that any lib later loaded via osl_loadModule (e.g.,
libgcc3_uno.so) would not bind to the same global (RTTI-related) symbols as
libsofficeapp.so and its dependencies (so, e.g., -fsanitize=function would
erroneously assume that bridges/source/cpp_uno/shared/component.cxx's
uno_initEnvironment is called with a different, non-matching uno_Environment
type).

Change-Id: I08b0cbc1f9eb74641eb617c46587a0a528a56c31
This commit is contained in:
Stephan Bergmann 2015-03-11 10:47:14 +01:00
parent b162753ead
commit 62b124b270
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compilerplugins/clang/checkconfigmacros.cxx
View File

@ -129,9 +129,14 @@ void CheckConfigMacros::checkMacro( const Token& macroToken, SourceLocation loca
{
if( configMacros.find( macroToken.getIdentifierInfo()->getName()) != configMacros.end())
{
report( DiagnosticsEngine::Error, "checking whether a config macro %0 is defined",
location ) << macroToken.getIdentifierInfo()->getName();
report( DiagnosticsEngine::Note, "use #if instead of #ifdef/#ifndef/defined", location );
const char* filename = compiler.getSourceManager().getPresumedLoc( location ).getFilename();
if( filename == NULL
|| strncmp( filename, SRCDIR "/include/LibreOfficeKit/", strlen( SRCDIR "/include/LibreOfficeKit/" )) != 0 )
{
report( DiagnosticsEngine::Error, "checking whether a config macro %0 is defined",
location ) << macroToken.getIdentifierInfo()->getName();
report( DiagnosticsEngine::Note, "use #if instead of #ifdef/#ifndef/defined", location );
}
}
}

9
include/LibreOfficeKit/LibreOfficeKitInit.h
View File

@ -39,7 +39,14 @@ extern "C"
void *_dlopen(const char *pFN)
{
return dlopen(pFN, RTLD_LAZY);
return dlopen(pFN, RTLD_LAZY
#if defined __clang__ && defined __linux__ \
&& defined ENABLE_RUNTIME_OPTIMIZATIONS
#if !ENABLE_RUNTIME_OPTIMIZATIONS
| RTLD_GLOBAL
#endif
#endif
);
}
void *_dlsym(void *Hnd, const char *pName)

2
libreofficekit/qa/unit/tiledrendering.cxx
View File

@ -19,6 +19,8 @@
#include <osl/file.hxx>
#include <rtl/bootstrap.hxx>
#include <config_options.h>
// see use of ENABLE_RUNTIME_OPTIMIZATIONS in LibreOfficeKintInit.h
#define LOK_USE_UNSTABLE_API
#include <LibreOfficeKit/LibreOfficeKitInit.h>
#include <LibreOfficeKit/LibreOfficeKit.hxx>