diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-01 11:59:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-01 11:59:36 +0200 |
| commit | 87662fd1b71db11f0759e0be03d8a288ee11b775 (patch) | |
| tree | 7e9659b6e581205c798844388cffcec88ecaa112 /src/3rdparty/masm/stubs | |
| parent | e8b01250fdbef269379df8c2481c9482317e8220 (diff) | |
| parent | 777cd6e9b10c83f5826fde67ad00a85c978218c0 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/quick/items/qquickevents_p_p.h
Change-Id: I8c699aeb46903e2ea80a97a346cb5af460859a98
Diffstat (limited to 'src/3rdparty/masm/stubs')
| -rw-r--r-- | src/3rdparty/masm/stubs/ExecutableAllocator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h index 471fe3c952..156b24b4e8 100644 --- a/src/3rdparty/masm/stubs/ExecutableAllocator.h +++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h @@ -123,7 +123,7 @@ struct ExecutableAllocator { } # endif # elif OS(INTEGRITY) - OSAllocator::setMemoryAttributes(addr, /*writable*/ true, /*executable*/ false); + OSAllocator::setMemoryAttributes(addr, size, /*writable*/ true, /*executable*/ false); # else int mode = PROT_READ | PROT_WRITE; if (mprotect(addr, size, mode) != 0) { @@ -159,7 +159,7 @@ struct ExecutableAllocator { } # endif # elif OS(INTEGRITY) - OSAllocator::setMemoryAttributes(addr, /*writable*/ false, /*executable*/ true); + OSAllocator::setMemoryAttributes(addr, size, /*writable*/ false, /*executable*/ true); # else int mode = PROT_READ | PROT_EXEC; if (mprotect(addr, size, mode) != 0) { |