From efe10908766d96974c008a6a8f124916fdca7a14 Mon Sep 17 00:00:00 2001 From: Anton Kling Date: Mon, 15 Apr 2024 23:47:25 +0200 Subject: Kernel: Improve "out of memory" error handling It can now boot with fairly low memory while not crashing and instead gracefully failing the operation. Userland still does not properly handle errors. --- userland/windowserver/ws.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'userland/windowserver/ws.c') diff --git a/userland/windowserver/ws.c b/userland/windowserver/ws.c index 6d01048..11efa59 100644 --- a/userland/windowserver/ws.c +++ b/userland/windowserver/ws.c @@ -103,6 +103,7 @@ void setup_display(DISPLAY *disp, const char *path, uint64_t size) { ; } disp->true_buffer = mmap(NULL, size, 0, 0, disp->vga_fd, 0); + assert(disp->true_buffer != (void *)(-1)); disp->back_buffer = malloc(size + 0x1000); disp->window = window; @@ -110,7 +111,7 @@ void setup_display(DISPLAY *disp, const char *path, uint64_t size) { assert(disp->wallpaper_fd >= 0); ftruncate(disp->wallpaper_fd, size); void *rc = mmap(NULL, size, 0, 0, disp->wallpaper_fd, 0); - assert(rc); + assert(rc != (void *)(-1)); disp->wallpaper_buffer = rc; for (int i = 0; i < disp->size / disp->bpp; i++) { uint32_t *p = disp->wallpaper_buffer + i * sizeof(uint32_t); -- cgit v1.2.3