diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-23 03:01:11 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-23 03:01:11 +0200 |
| commit | 5d4df3251726a8efe4834135433b6607f655430f (patch) | |
| tree | 3b13b15266054b1a829dcec142031dba8a74181f | |
| parent | 24d4a7ac7df1be96aed472fdc624bb929d8c69af (diff) | |
| parent | b2e2e76b1e96df5086158d7367ca91a8f2c4614e (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ie43c24df20344cb3b84249e675aacc52429a3868
| -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); |