From 85fc49612816dcfc81c9dc265b146b0b90b0f184 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 8 Nov 2017 15:58:25 +0100
Subject: Prevent crashes when profiling translation bindings

The m_v4Function member can now be a nullptr, which means we cannot use
it as ID and we cannot retrieve the source location from it.

Change-Id: Ibb49a3e68cf961f9ffe2a83b2a0b83f7d04e149e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 .../qml/debugger/qqmlprofilerservice/data/qstr.qml   |  9 +++++++++
 .../qqmlprofilerservice/qqmlprofilerservice.pro      |  3 ++-
 .../qqmlprofilerservice/tst_qqmlprofilerservice.cpp  | 20 ++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/qml/debugger/qqmlprofilerservice/data/qstr.qml

(limited to 'tests')

diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/data/qstr.qml b/tests/auto/qml/debugger/qqmlprofilerservice/data/qstr.qml
new file mode 100644
index 0000000000..09dcd34b5c
--- /dev/null
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/data/qstr.qml
@@ -0,0 +1,9 @@
+import QtQml 2.0
+
+Timer {
+    property string stuff: qsTr("foo")
+
+    running: true
+    interval: 1
+    onTriggered: Qt.quit();
+}
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
index 95d743e9ff..a26f48e6c7 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
@@ -19,4 +19,5 @@ OTHER_FILES += \
     data/TestImage_2x2.png \
     data/signalSourceLocation.qml \
     data/javascript.qml \
-    data/timer.qml
+    data/timer.qml \
+    data/qstr.qml
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 45e4ad1207..4d37f16e41 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -298,6 +298,7 @@ private slots:
     void signalSourceLocation();
     void javascript();
     void flushInterval();
+    void translationBinding();
 };
 
 #define VERIFY(type, position, expected, checks) QVERIFY(verify(type, position, expected, checks))
@@ -705,6 +706,25 @@ void tst_QQmlProfilerService::flushInterval()
     checkJsHeap();
 }
 
+void tst_QQmlProfilerService::translationBinding()
+{
+    QCOMPARE(connect(true, "qstr.qml"), ConnectSuccess);
+
+    m_client->sendRecordingStatus(true);
+
+    checkTraceReceived();
+    checkJsHeap();
+
+    QQmlProfilerData expected(0, QQmlProfilerDefinitions::RangeStart,
+                              QQmlProfilerDefinitions::Binding);
+    VERIFY(MessageListQML, 8, expected,
+           CheckDetailType | CheckMessageType);
+
+    expected.messageType = QQmlProfilerDefinitions::RangeEnd;
+    VERIFY(MessageListQML, 10, expected,
+           CheckDetailType | CheckMessageType);
+}
+
 QTEST_MAIN(tst_QQmlProfilerService)
 
 #include "tst_qqmlprofilerservice.moc"
-- 
cgit v1.2.3