diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-01-17 09:37:01 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-01-18 12:44:11 +0000 |
| commit | 2a6882a7416c91770f75d4e23e084b872088fbdf (patch) | |
| tree | e800026cfede08c34477dc548737d576a9d94348 | |
| parent | 4c0f5d4ad08b764a80cd86c2cc2c100627498868 (diff) | |
| download | qtwebengine-chromium-2a6882a7416c91770f75d4e23e084b872088fbdf.tar.gz | |
Disable allocator check
Qt platform does not override default allocator. Fixes crash on macOS.
Change-Id: I82d1fd165d83e678d9e370fc060819e2baa8dd57
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/content/app/content_main_runner_impl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/content/app/content_main_runner_impl.cc b/chromium/content/app/content_main_runner_impl.cc index a9d97e4f6c5..e8eaf9a0156 100644 --- a/chromium/content/app/content_main_runner_impl.cc +++ b/chromium/content/app/content_main_runner_impl.cc @@ -721,11 +721,13 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) { } #endif +#if !defined(TOOLKIT_QT) // If we are on a platform where the default allocator is overridden (shim // layer on windows, tcmalloc on Linux Desktop) smoke-tests that the // overriding logic is working correctly. If not causes a hard crash, as its // unexpected absence has security implications. CHECK(base::allocator::IsAllocatorInitialized()); +#endif #if defined(OS_POSIX) || defined(OS_FUCHSIA) if (!process_type.empty()) { |