diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-12-17 13:35:17 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2025-12-19 10:46:05 +0100 |
| commit | 88dbb39e3b347e67eb0e5ee059c2545a1fbcaed9 (patch) | |
| tree | d0297daac95bdc0cc265157bdd5ab2ffa7509862 | |
| parent | 68b060af820b905ddecd9ca65a52660b769ea534 (diff) | |
QtQml: Check return field for toString()
In theory you could call toString() without providing space for the
return value. We generally check argv[0] before writing to it.
Pick-to: 6.11 6.10 6.8 6.5
Change-Id: I496eca3f428d0f8452a5bc0b1cb8ea78ee3805bb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Olivier De Cannière <olivier.decanniere@qt.io>
| -rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 950838c11c..1f9429651e 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -3167,6 +3167,8 @@ void QObjectMethod::callInternalWithMetaTypes( QV4::coerceAndCall( v4, &metaMethod, argv, types, argc, [v4, thisMeta, object](void **argv, int) { + if (!argv[0]) + return; *static_cast<QString *>(argv[0]) = QObjectWrapper::objectToString(v4, thisMeta, object.qObject()); }); |