From f7df383a284e2189f0137efd9d9496f2be79566b Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Mon, 24 Sep 2018 08:52:44 +0200
Subject: 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>
---
 src/androidextras/android/qandroidintent.cpp | 2 ++
 1 file changed, 2 insertions(+)

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);
-- 
cgit v1.2.3