godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89307 from alesliehughes/wayland_usage

Browse Source 
Wayland: Stop possible Null pointer dereferences
This commit is contained in:
Rémi Verschelde 2024-03-09 22:19:48 +01:00
commit 3ca230df25
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
platform/linuxbsd/wayland/wayland_thread.cpp
View File

@ -2192,9 +2192,14 @@ void WaylandThread::_wp_tablet_tool_on_done(void *data, struct zwp_tablet_tool_v
void WaylandThread::_wp_tablet_tool_on_removed(void *data, struct zwp_tablet_tool_v2 *zwp_tablet_tool_v2) { void WaylandThread::_wp_tablet_tool_on_removed(void *data, struct zwp_tablet_tool_v2 *zwp_tablet_tool_v2) {
TabletToolState *ts = wp_tablet_tool_get_state(zwp_tablet_tool_v2); TabletToolState *ts = wp_tablet_tool_get_state(zwp_tablet_tool_v2);
if (!ts) {
return;
}
SeatState *ss = wl_seat_get_seat_state(ts->wl_seat); SeatState *ss = wl_seat_get_seat_state(ts->wl_seat);
if (!ts || !ss) { if (!ss) {
return; return;
} }
@ -2214,9 +2219,14 @@ void WaylandThread::_wp_tablet_tool_on_removed(void *data, struct zwp_tablet_too
void WaylandThread::_wp_tablet_tool_on_proximity_in(void *data, struct zwp_tablet_tool_v2 *zwp_tablet_tool_v2, uint32_t serial, struct zwp_tablet_v2 *tablet, struct wl_surface *surface) { void WaylandThread::_wp_tablet_tool_on_proximity_in(void *data, struct zwp_tablet_tool_v2 *zwp_tablet_tool_v2, uint32_t serial, struct zwp_tablet_v2 *tablet, struct wl_surface *surface) {
TabletToolState *ts = wp_tablet_tool_get_state(zwp_tablet_tool_v2); TabletToolState *ts = wp_tablet_tool_get_state(zwp_tablet_tool_v2);
if (!ts) {
return;
}
SeatState *ss = wl_seat_get_seat_state(ts->wl_seat); SeatState *ss = wl_seat_get_seat_state(ts->wl_seat);
if (!ts || !ss) { if (!ss) {
return; return;
} }
@ -2237,9 +2247,14 @@ void WaylandThread::_wp_tablet_tool_on_proximity_in(void *data, struct zwp_table
void WaylandThread::_wp_tablet_tool_on_proximity_out(void *data, struct zwp_tablet_tool_v2 *zwp_tablet_tool_v2) { void WaylandThread::_wp_tablet_tool_on_proximity_out(void *data, struct zwp_tablet_tool_v2 *zwp_tablet_tool_v2) {
TabletToolState *ts = wp_tablet_tool_get_state(zwp_tablet_tool_v2); TabletToolState *ts = wp_tablet_tool_get_state(zwp_tablet_tool_v2);
if (!ts) {
return;
}
SeatState *ss = wl_seat_get_seat_state(ts->wl_seat); SeatState *ss = wl_seat_get_seat_state(ts->wl_seat);
if (!ts || !ss) { if (!ss) {
return; return;
} }
@ -2389,9 +2404,14 @@ void WaylandThread::_wp_tablet_tool_on_button(void *data, struct zwp_tablet_tool
void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_v2 *zwp_tablet_tool_v2, uint32_t time) { void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_v2 *zwp_tablet_tool_v2, uint32_t time) {
TabletToolState *ts = wp_tablet_tool_get_state(zwp_tablet_tool_v2); TabletToolState *ts = wp_tablet_tool_get_state(zwp_tablet_tool_v2);
if (!ts) {
return;
}
SeatState *ss = wl_seat_get_seat_state(ts->wl_seat); SeatState *ss = wl_seat_get_seat_state(ts->wl_seat);
if (!ts || !ss) { if (!ss) {
return; return;
} }