Przeglądaj źródła

Merge branch 'issue15050' into candidate-5.6.2

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 lat temu
rodzic
commit
791c13c203
1 zmienionych plików z 2 dodań i 0 usunięć
  1. 2 0
      common/dllserver/thorplugin.cpp

+ 2 - 0
common/dllserver/thorplugin.cpp

@@ -247,6 +247,7 @@ static void secscan (bfd *file, sec_ptr sec, void *userParam)
         bfd_get_section_contents(file, sec, data, 0, size);
     }
 }
+static CriticalSection bfdCs;
 #endif
 
 static bool getResourceFromMappedFile(const char * filename, const byte * start_addr, MemoryBuffer &data, const char * type, unsigned id)
@@ -330,6 +331,7 @@ extern bool getResourceFromFile(const char *filename, MemoryBuffer &data, const
     FreeLibrary(dllHandle);
     return true;
 #elif defined (_USE_BINUTILS)
+    CriticalBlock block(bfdCs);
     bfd_init ();
     bfd *file = bfd_openr(filename, NULL);
     if (file)