summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-12-05 15:08:40 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-12-12 10:23:27 +0000
commitca5c35c25410431c289c665106a15fb987b106e0 (patch)
tree91a55f1846d2b576122312bcc770884495a39ed0
parent0d25612fe5959773b57db2acbc13b989bac934fa (diff)
downloadqtwebengine-chromium-ca5c35c25410431c289c665106a15fb987b106e0.tar.gz
Fix override of malloc
Change-Id: I79f02eec0324301544da18ee98931f164c97ccd1 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--chromium/base/process/memory_linux.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chromium/base/process/memory_linux.cc b/chromium/base/process/memory_linux.cc
index 91eef2186c6..eec5b77210d 100644
--- a/chromium/base/process/memory_linux.cc
+++ b/chromium/base/process/memory_linux.cc
@@ -100,6 +100,7 @@ bool UncheckedMalloc(size_t size, void** result) {
#if BUILDFLAG(USE_ALLOCATOR_SHIM)
*result = allocator::UncheckedAlloc(size);
#elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || \
+ defined(TOOLKIT_QT) || \
(!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC))
*result = malloc(size);
#elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)