From c2b2ef32ca523bc030aadc1cea524d4918b03c09 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Thu, 3 Apr 2014 17:03:36 +0200 Subject: Don't access null pointer Change-Id: If9ac712543f7c7fd85d877bba76e67ce89c60c61 Reviewed-by: Michael Brasser --- src/plugins/platforms/xcb/qxcbkeyboard.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp index d5c876624a..69601f44d4 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -665,9 +665,12 @@ void QXcbKeyboard::clearXKBConfig() void QXcbKeyboard::printKeymapError(const char *error) const { - qWarning() << error << "Current XKB configuration data search paths are: "; - for (unsigned int i = 0; i < xkb_context_num_include_paths(xkb_context); ++i) - qWarning() << xkb_context_include_path_get(xkb_context, i); + qWarning() << error; + if (xkb_context) { + qWarning() << "Current XKB configuration data search paths are: "; + for (unsigned int i = 0; i < xkb_context_num_include_paths(xkb_context); ++i) + qWarning() << xkb_context_include_path_get(xkb_context, i); + } qWarning() << "Use QT_XKB_CONFIG_ROOT environmental variable to provide an additional search path, " "add ':' as separator to provide several search paths and/or make sure that XKB configuration data " "directory contains recent enough contents, to update please see http://cgit.freedesktop.org/xkeyboard-config/ ."; -- cgit v1.2.3