From a1d9c6a8e61fd8dfa5b12c56ec14a1a891f5754e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?=
Date: Thu, 30 Sep 2021 07:31:45 +0200 Subject: [PATCH] Make imageviewer not segfault on XCB errors Fixing the issue properly doesn't seem worth the effort, shared memory is ugly, and incremental loading is a lot of code. Xlib - XCB 1:0 --- example/imageviewer/imageviewer.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/example/imageviewer/imageviewer.cc b/example/imageviewer/imageviewer.cc index 2cf4b1ae..73f7b848 100644 --- a/example/imageviewer/imageviewer.cc +++ b/example/imageviewer/imageviewer.cc @@ -263,8 +263,15 @@ main(int argc, char** argv) { while (true) { xcb_generic_event_t* event = xcb_wait_for_event(c); - bool reload = false; + // XXX: Large pictures may cause XCB_CONN_CLOSED_REQ_LEN_EXCEED because, + // e.g., 4_194_303 * 4 = 16_777_212 = not nearly enough, + // requiring some trickery to be uploaded to the server. + if (!event) { + printf("XCB failure (error code %d)\n", xcb_connection_has_error(c)); + exit(EXIT_FAILURE); + } + bool reload = false; switch (event->response_type & 0x7F) { case XCB_EXPOSE: { xcb_expose_event_t* e = (xcb_expose_event_t*)event;