aboutsummaryrefslogtreecommitdiffstats
path: root/src/3rdparty/masm/wtf/OSAllocator.h
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@qt.io>2018-09-28 12:15:58 +0200
committerJanne Koskinen <janne.p.koskinen@qt.io>2018-09-28 13:34:08 +0000
commit039a28468a1812b8f0662aba62c173e572899841 (patch)
tree72580d61c703268fd8f3acb4c5d316dc4a69fb06 /src/3rdparty/masm/wtf/OSAllocator.h
parent4441cefd76446a9e464665bd7fb0666f0e2495c3 (diff)
Fix Integrity OS allocator memory attributes
Correctly set the attributes when allocation is extending to more than one page. Code spanning multiple pages can now be executed. Task-number: QTBUG-70350 Change-Id: I02af1add274f80befda5662d9670bfd2052c3c52 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty/masm/wtf/OSAllocator.h')
-rw-r--r--src/3rdparty/masm/wtf/OSAllocator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/wtf/OSAllocator.h b/src/3rdparty/masm/wtf/OSAllocator.h
index 366dd73993..9648a4e08f 100644
--- a/src/3rdparty/masm/wtf/OSAllocator.h
+++ b/src/3rdparty/masm/wtf/OSAllocator.h
@@ -75,7 +75,7 @@ public:
static bool canAllocateExecutableMemory();
#if defined(Q_OS_INTEGRITY)
- static void setMemoryAttributes(void* addr, bool writable, bool executable);
+ static void setMemoryAttributes(void* addr, size_t size, bool writable, bool executable);
#endif
};