diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-01-11 11:33:26 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-01-12 10:09:53 +0100 |
| commit | 131e2c81d40e3d324c62e113749a08e7993d008f (patch) | |
| tree | b8bb24c8a189cba4ef4a46d5eb5c810b7905f51c /src/qml/jit | |
| parent | 8dbe5b2be4e65e96013651f1ffee1cc26dd1ead1 (diff) | |
masm: Add error handling for failed mprotect()
If we cannot mprotect() we have to abort the JIT compilation. Delete
RepatchBuffer.h as it is unfixable in that regard. Luckily we don't use
it.
Task-number: QTBUG-89659
Pick-to: 5.15
Change-Id: Ic5ddbdf51b471db4ddeaa75aab48b24c1f7ced56
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src/qml/jit')
| -rw-r--r-- | src/qml/jit/qv4assemblercommon.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/jit/qv4assemblercommon.cpp b/src/qml/jit/qv4assemblercommon.cpp index 137a04cc10..9cf118e04b 100644 --- a/src/qml/jit/qv4assemblercommon.cpp +++ b/src/qml/jit/qv4assemblercommon.cpp @@ -160,7 +160,8 @@ void PlatformAssemblerCommon::link(Function *function, const char *jitKind) generateFunctionTable(function, &codeRef); - linkBuffer.makeExecutable(); + if (Q_UNLIKELY(!linkBuffer.makeExecutable())) + function->jittedCode = nullptr; // The function is not executable, but the coderef exists. } void PlatformAssemblerCommon::prepareCallWithArgCount(int argc) |