From 572a0b6bd5e9dd92de51af52b18b220f74510ae9 Mon Sep 17 00:00:00 2001 From: Oskari Alaranta Date: Sat, 21 Feb 2026 03:40:39 +0200 Subject: [PATCH] Fix some crashes on invalid ids --- xbanan/Base.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xbanan/Base.cpp b/xbanan/Base.cpp index 417bd95..66e1c7a 100644 --- a/xbanan/Base.cpp +++ b/xbanan/Base.cpp @@ -1501,6 +1501,7 @@ BAN::ErrorOr handle_packet(Client& client_info, BAN::ConstByteSpan packet) dprintln("DestroyWinow"); dprintln(" window: {}", wid); + (void)TRY_REF(get_window(wid)); TRY(destroy_window(client_info, wid)); break; @@ -2452,12 +2453,9 @@ BAN::ErrorOr handle_packet(Client& client_info, BAN::ConstByteSpan packet) dprintln("FreePixmap"); dprintln(" pixmap: {}", pid); - auto it = g_objects.find(pid); - ASSERT(it != g_objects.end()); - ASSERT(it->value->type == Object::Type::Pixmap); - + (void)TRY_REF(get_pixmap(pid)); client_info.objects.remove(pid); - g_objects.remove(it); + g_objects.remove(pid); break; }