[Bf-blender-cvs] [c1d295e905f] master: Fix crash in 827fa8176737f822b7f8d2354b05e59976c7101a
Campbell Barton
noreply at git.blender.org
Tue Jun 14 09:36:28 CEST 2022
Commit: c1d295e905f9fb4a05218bf2db674e7739b179a6
Author: Campbell Barton
Date: Tue Jun 14 17:35:29 2022 +1000
Branches: master
https://developer.blender.org/rBc1d295e905f9fb4a05218bf2db674e7739b179a6
Fix crash in 827fa8176737f822b7f8d2354b05e59976c7101a
Missing null pointer check.
===================================================================
M intern/ghost/intern/GHOST_SystemWayland.cpp
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp
index 9e683ceb437..49342110df7 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -2163,6 +2163,10 @@ GHOST_TSuccess GHOST_SystemWayland::getCursorPosition(int32_t &x, int32_t &y) co
}
GHOST_WindowWayland *win = static_cast<GHOST_WindowWayland *>(wl_surface_get_user_data(surface));
+ if (!win) {
+ return GHOST_kFailure;
+ }
+
const wl_fixed_t scale = win->scale();
x = wl_fixed_to_int(scale * input->xy[0]);
y = wl_fixed_to_int(scale * input->xy[1]);
More information about the Bf-blender-cvs
mailing list