mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-07 08:21:20 -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

7
src/ssd/resize-indicator.c
View file

@ -3,6 +3,7 @@
#include <wlr/types/wlr_scene.h>
#include <wlr/util/box.h>
#include <wlr/util/log.h>
#include "common/scene-helpers.h"
#include "config/rcxml.h"
#include "labwc.h"
#include "resize-indicator.h"
@ -44,10 +45,10 @@ resize_indicator_init(struct view *view)
struct resize_indicator *indicator = &view->resize_indicator;
assert(!indicator->tree);
indicator->tree = wlr_scene_tree_create(view->scene_tree);
indicator->border = wlr_scene_rect_create(
indicator->tree = lab_wlr_scene_tree_create(view->scene_tree);
indicator->border = lab_wlr_scene_rect_create(
indicator->tree, 0, 0, rc.theme->osd_border_color);
indicator->background = wlr_scene_rect_create(
indicator->background = lab_wlr_scene_rect_create(
indicator->tree, 0, 0, rc.theme->osd_bg_color);
indicator->text = scaled_font_buffer_create(indicator->tree);