diff options
author | Paul Olav Tvete <paul.tvete@digia.com> | 2014-10-08 09:51:10 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@digia.com> | 2014-10-10 10:04:34 +0200 |
commit | 7755b4af417e6b6da3dac0617eb2ce3a37b9a53c (patch) | |
tree | b9bd47ec2a6648598e86bdf8e9c025265ed1d48e /src/android/jar/src/org/qtproject | |
parent | 8d8000b5feb35fd284d11118891d9d72fafef3cb (diff) |
Android: null pointer check
Task-number: QTBUG-41680
Change-Id: I740fb2a6df5613a8ee724b59dab08674a3337236
Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/android/jar/src/org/qtproject')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java b/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java index 6de66fe512..80028e1b02 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java @@ -174,6 +174,9 @@ public class QtInputConnection extends BaseInputConnection QtExtractedText qExtractedText = QtNativeInputConnection.getExtractedText(request.hintMaxChars, request.hintMaxLines, flags); + if (qExtractedText == null) + return null; + ExtractedText extractedText = new ExtractedText(); extractedText.partialEndOffset = qExtractedText.partialEndOffset; extractedText.partialStartOffset = qExtractedText.partialStartOffset; |