mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-18 05:33:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tree-wide: use die_if_null() for wlr_scene alloc failures
Some checks failed
labwc.github.io / notify (push) Has been cancelled
Details

Browse source 
wlr_scene_*_create() functions all allocate memory via calloc() and
return NULL if the allocation fails. Previously, the failures were
handled in any of 3 different ways:

 - sending a wayland protocol error
 - exiting labwc with an error
 - segfault (no NULL check at all)

Since labwc does not attempt to survive heap exhaustion in other
allocation paths (such as `znew`), it seems more consistent to use the
same die_if_null() check used in those paths to exit with an error.

For the three most common create() functions (tree, rect, buffer),
add small lab_wlr_ wrappers to common/scene-helpers.
This commit is contained in:
John Lindgren 2026-02-23 16:34:36 -05:00 • committed by Johan Malm
parent c4effef0ec
commit 16c5373be5
27 changed files with 155 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/session-lock.c
View file

@ -6,6 +6,7 @@
#include <wlr/types/wlr_scene.h>
#include <wlr/types/wlr_session_lock_v1.h>
#include "common/mem.h"
#include "common/scene-helpers.h"
#include "labwc.h"
#include "node.h"
#include "output.h"
@ -135,8 +136,11 @@ handle_new_surface(struct wl_listener *listener, void *data)
}
lock_output->surface = lock_surface;
struct wlr_scene_tree *surface_tree =
wlr_scene_subsurface_tree_create(lock_output->tree, lock_surface->surface);
die_if_null(surface_tree);
node_descriptor_create(&surface_tree->node,
LAB_NODE_SESSION_LOCK_SURFACE, /*view*/ NULL, /*data*/ NULL);
@ -209,12 +213,7 @@ session_lock_output_create(struct session_lock_manager *manager, struct output *
struct session_lock_output *lock_output = znew(*lock_output);
struct wlr_scene_tree *tree = wlr_scene_tree_create(output->session_lock_tree);
if (!tree) {
wlr_log(WLR_ERROR, "session-lock: wlr_scene_tree_create()");
free(lock_output);
goto exit_session;
}
struct wlr_scene_tree *tree = lab_wlr_scene_tree_create(output->session_lock_tree);
/*
* The ext-session-lock protocol says that the compositor should blank
@ -222,13 +221,7 @@ session_lock_output_create(struct session_lock_manager *manager, struct output *
* fully hidden
*/
float black[4] = { 0.f, 0.f, 0.f, 1.f };
struct wlr_scene_rect *background = wlr_scene_rect_create(tree, 0, 0, black);
if (!background) {
wlr_log(WLR_ERROR, "session-lock: wlr_scene_rect_create()");
wlr_scene_node_destroy(&tree->node);
free(lock_output);
goto exit_session;
}
struct wlr_scene_rect *background = lab_wlr_scene_rect_create(tree, 0, 0, black);
/*
* Delay blanking output by 100ms to prevent flicker. If the session is
@ -258,12 +251,6 @@ session_lock_output_create(struct session_lock_manager *manager, struct output *
lock_output_reconfigure(lock_output);
wl_list_insert(&manager->lock_outputs, &lock_output->link);
return;
exit_session:
/* TODO: Consider a better - but secure - way to deal with this */
wlr_log(WLR_ERROR, "out of memory");
exit(EXIT_FAILURE);
}
static void