diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-09-24 08:52:44 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2018-10-19 09:47:27 +0000 |
| commit | f7df383a284e2189f0137efd9d9496f2be79566b (patch) | |
| tree | 3abf55c0a898d12474642d1b60d118eb00b4ec39 /src | |
| parent | dafb9ad2ecdfa35fc9f36b1596fd5c6e52e92325 (diff) | |
Check if the array is valid before accessing it
Task-number: QTBUG-70284
Change-Id: Ic2a0613f3f57661e8c6b4665cefbd6dc73fd37f3
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/androidextras/android/qandroidintent.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/androidextras/android/qandroidintent.cpp b/src/androidextras/android/qandroidintent.cpp index 318b576..5c89b89 100644 --- a/src/androidextras/android/qandroidintent.cpp +++ b/src/androidextras/android/qandroidintent.cpp @@ -125,6 +125,8 @@ QByteArray QAndroidIntent::extraBytes(const QString &key) QAndroidJniExceptionCleaner cleaner; auto array = m_handle.callObjectMethod("getByteArrayExtra", "(Ljava/lang/String;)[B", QAndroidJniObject::fromString(key).object()); + if (!array.isValid() || !array.object()) + return QByteArray(); QAndroidJniEnvironment env; auto sz = env->GetArrayLength(jarray(array.object())); QByteArray res(sz, Qt::Initialization::Uninitialized); |