yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[wayland] Add safety check for WaylandCursorTheme::get

Browse source 
It's possible that loadTheme fails in which case m_theme is null
and would crash the wayland cursor library.
This commit is contained in:
Martin Gräßlin 2015-01-09 16:02:03 +01:00
parent 65007cd104
commit 2cd25257d9
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wayland_backend.cpp
View file

@ -351,6 +351,10 @@ wl_cursor_image *WaylandCursorTheme::get(Qt::CursorShape shape)
if (!m_theme) { if (!m_theme) {
loadTheme(); loadTheme();
} }
if (!m_theme) {
// loading cursor failed
return nullptr;
}
wl_cursor *c = wl_cursor_theme_get_cursor(m_theme, Cursor::self()->cursorName(shape).constData()); wl_cursor *c = wl_cursor_theme_get_cursor(m_theme, Cursor::self()->cursorName(shape).constData());
if (!c || c->image_count <= 0) { if (!c || c->image_count <= 0) {
return nullptr; return nullptr;