external/firebird/sanitizer.patch

   1 --- builds/posix/fbintl.vers
   2 +++ builds/posix/fbintl.vers
   3 @@ -29,3 +29,4 @@
   4  LD_lookup_texttype
   5  LD_setup_attributes
   6  LD_version
   7 +_ZTI*
   8 --- builds/posix/fbplugin.vers
   9 +++ builds/posix/fbplugin.vers
  10 @@ -26,3 +26,4 @@
  11  #
  12
  13  firebird_plugin
  14 +_ZTI*
  15 --- builds/posix/firebird.vers
  16 +++ builds/posix/firebird.vers
  17 @@ -367,3 +367,4 @@
  18
  19  KEYWORD_stringIsAToken
  20  KEYWORD_getTokens
  21 +_ZTI*
  22 --- builds/posix/make.defaults
  23 +++ builds/posix/make.defaults
  24 @@ -252,7 +252,7 @@
  25  # LINKER OPTIONS
  26  #
  27
  28 -UNDEF_PLATFORM = -Wl,--no-undefined
  29 +UNDEF_PLATFORM =
  30  ifeq ($(TARGET),Debug)
  31    UNDEF_FLAGS = $(UNDEF_PLATFORM)
  32  endif
  33 @@ -291,7 +291,7 @@
  34  LIB_LINK_MAPFILE= -Wl,--version-script,$(1)
  35  FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient $(MATHLIB)
  36
  37 -EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(LINK_EMPTY_SYMBOLS)
  38 +EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS)
  39  LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared
  40
  41  FB_DAEMON = $(BIN)/firebird$(EXEC_EXT)
  42 --- src/common/classes/alloc.cpp
  43 +++ src/common/classes/alloc.cpp
  44 @@ -2535,7 +2535,7 @@
  45         const char* myStack = &probeVar;
  46         const char* thisLocation = (const char*) this;
  47         ptrdiff_t distance = thisLocation - myStack;
  48 -       fb_assert(absVal(distance) < 128 * 1024);
  49 +       //fb_assert(absVal(distance) < 128 * 1024);
  50  }
  51  #endif
  52
  53 --- src/common/os/posix/mod_loader.cpp
  54 +++ src/common/os/posix/mod_loader.cpp
  55 @@ -88,7 +88,7 @@
  56
  57  ModuleLoader::Module* ModuleLoader::loadModule(const Firebird::PathName& modPath)
  58  {
  59 -       void* module = dlopen(modPath.nullStr(), FB_RTLD_MODE);
  60 +       void* module = dlopen(modPath.nullStr(), FB_RTLD_MODE | RTLD_GLOBAL);
  61         if (module == NULL)
  62         {
  63  #ifdef DEV_BUILD
  64 --- src/jrd/met.epp
  65 +++ src/jrd/met.epp
  66 @@ -1486,10 +1486,11 @@
  67                         USHORT offset = p[0] | (p[1] << 8);
  68                         p += 2;
  69
  70 -                       const Ods::Descriptor* odsDflDesc = (Ods::Descriptor*) p;
  71 -                       p = (UCHAR*) (odsDflDesc + 1);
  72 +                       Ods::Descriptor odsDflDesc;
  73 +                       memcpy(&odsDflDesc, p, sizeof (Ods::Descriptor));
  74 +                       p = (UCHAR*) (((Ods::Descriptor*) p) + 1);
  75
  76 -                       dsc desc = *odsDflDesc;
  77 +                       dsc desc = odsDflDesc;
  78                         desc.dsc_address = const_cast<UCHAR*>(p);
  79                         EVL_make_value(tdbb, &desc, &format->fmt_defaults[offset], relation->rel_pool);
  80