diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-06-19 18:28:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-19 17:23:10 +0000 |
| commit | ba64b7d013fb95fb7b3afe9f1724edae7fcca2ed (patch) | |
| tree | 9aaddf6c214b41999a584129e63282b443734ca9 /tests/auto/qml/qjsengine | |
| parent | 9333ea8649838d7e0400b0e94c8cbd4fa5d216b0 (diff) | |
| parent | 5100d558742c682d83e0d4033d78ed4c9f521f56 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/qml/compiler/qv4codegen.cpp
tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
Change-Id: I010505326d76ee728ffe5fbd4c7879f28adadb12
Diffstat (limited to 'tests/auto/qml/qjsengine')
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 42ee089bb5..cb167fb6bf 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -201,6 +201,7 @@ private slots: void basicBlockMergeAfterLoopPeeling(); + void modulusCrash(); void malformedExpression(); void scriptScopes(); @@ -4148,6 +4149,15 @@ void tst_QJSEngine::basicBlockMergeAfterLoopPeeling() } +void tst_QJSEngine::modulusCrash() +{ + QJSEngine engine; + QJSValue result = engine.evaluate( + "var a = -2147483648; var b = -1; var c = a % b; c;" + ); + QVERIFY(result.isNumber() && result.toNumber() == 0.); +} + void tst_QJSEngine::malformedExpression() { QJSEngine engine; |