diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-06-10 11:08:21 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-06-13 15:08:11 +0200 |
| commit | e91b8b74258bc39146c33d0b93ada2b6dc6c9cbb (patch) | |
| tree | 0e7dcf9a650623cfdf8f3c66c300dee0716793ac /src/virtualkeyboard | |
| parent | fb30b41f72612da5a279c2cec6c0d89bc0101942 (diff) | |
Avoid crash from nullptr access
Experienced when trying to reproduce QTBUG-85414 on macOS. The
platformInputContext variable is tested for nullptr elsewhere, so it's
evidently plausible that it is.
Pick-to: 6.4 6.3
Change-Id: I9aa1047fa58a760c5d1a51acac96620e1438ceb6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/virtualkeyboard')
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp index d286d46e..801f9a0f 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. @@ -167,6 +167,8 @@ QString QVirtualKeyboardInputContextPrivate::locale() const void QVirtualKeyboardInputContextPrivate::setLocale(const QString &locale) { VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContextPrivate::setLocale():" << locale; + if (!platformInputContext) + return; QLocale newLocale(locale); if (newLocale != platformInputContext->locale()) { platformInputContext->setLocale(newLocale); |