diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-20 03:00:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-20 03:00:15 +0200 |
| commit | b2e2e76b1e96df5086158d7367ca91a8f2c4614e (patch) | |
| tree | d8f6337862b42685180b79e5266b0dc7bf7a73f7 | |
| parent | 467eacf0a0379356ea99f53c1300f07261d1664c (diff) | |
| parent | f7df383a284e2189f0137efd9d9496f2be79566b (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta4v5.12.0-beta3
Change-Id: I88b7094f8b625c14f2524576e73cf7fc3f807a1d
| -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); |