diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-09-12 21:08:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-09-12 22:27:02 +0200 |
| commit | 78a2c0752c599d5dc951b8cf6fbe741bda0eeedd (patch) | |
| tree | 42f68d409f205ab4f3e48afe9c0556881a3456cb /unotools | |
| parent | 34d229cecadba9d216d7b1111146a1bace84983e (diff) | |
ofz: better workaround for broken msan build
workaround https://github.com/google/oss-fuzz/issues/6427 by
forcing use of the libc++.a in /usr/msan/lib when compiling the
msan version
Change-Id: I4e992cd7710b5929e74034db7a49c590349149fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122014
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/i18n/resmgr.cxx | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx index ede78900725b..62991153f01c 100644 --- a/unotools/source/i18n/resmgr.cxx +++ b/unotools/source/i18n/resmgr.cxx @@ -125,11 +125,6 @@ namespace Translate auto aFind = aCache.find(sUnique); if (aFind != aCache.end()) return aFind->second; -#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) - std::locale aRet; - aCache[sUnique] = aRet; - return aRet; -#else boost::locale::generator gen; gen.characters(boost::locale::char_facet); gen.categories(boost::locale::message_facet | boost::locale::information_facet); @@ -201,14 +196,10 @@ namespace Translate aCache[sUnique] = aRet; return aRet; -#endif } OUString get(TranslateId sContextAndId, const std::locale &loc) { -#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) - return createFromUtf8(sContextAndId.mpId, strlen(sContextAndId.mpId)); -#else assert(!strchr(sContextAndId.mpId, '\004') && "should be using nget, not get"); //if it's a key id locale, generate it here @@ -230,15 +221,10 @@ namespace Translate result = result.replaceAll(OUString::fromUtf8("\xC3\x9F"), "ss"); } return result; -#endif } OUString nget(TranslateNId aContextSingularPlural, int n, const std::locale &loc) { -#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) - const char* pForm = n == 0 ? aContextSingularPlural.mpSingular : aContextSingularPlural.mpPlural; - return createFromUtf8(pForm, strlen(pForm)); -#else //if it's a key id locale, generate it here if (std::use_facet<boost::locale::info>(loc).language() == "qtz") { @@ -258,7 +244,6 @@ namespace Translate result = result.replaceAll(OUString::fromUtf8("\xC3\x9F"), "ss"); } return result; -#endif } static ResHookProc pImplResHookProc = nullptr; |