Skip to content

Commit daa252a

Browse files
committed
win32: Better checks for only valid menu events
1 parent ffbf055 commit daa252a

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/backends/win32/backend.zig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,11 +402,15 @@ pub fn Events(comptime T: type) type {
402402
// For menubar item events, HIWORD(wp) and lp are set to 0.
403403
else if (code == 0) {
404404
const data = getEventUserData(hwnd);
405-
const window: *Window = @ptrFromInt(data.classUserdata);
405+
const window_ptr: ?*Window = @ptrFromInt(data.classUserdata);
406406
const id: u16 = @intCast(wp & 0xFFFF);
407407

408-
if (window.menu_item_callbacks.items[id]) |callback| {
409-
callback();
408+
if (window_ptr) |window| {
409+
if (id < window.menu_item_callbacks.items.len) {
410+
if (window.menu_item_callbacks.items[id]) |callback| {
411+
callback();
412+
}
413+
}
410414
}
411415
}
412416
},

0 commit comments

Comments
 (0)