steven/beansprout-custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change errdefers in create()/init() functions

Browse source 
They should use gpa.destroy() instead of foo.destroy() because (most) of
them have fields that may not be initialized by the first error, so
the foo.destroy() could crash.
This commit is contained in:
Ben Buhse 2026-02-13 19:30:21 -06:00
commit 6bf607b759
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
11 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/XkbBindings.zig
View file

@ -56,7 +56,7 @@ const XkbBinding = struct {
fn create(xkb_binding_v1: *river.XkbBindingV1, command: Command, context: *Context) !*XkbBinding {
var xkb_binding = try utils.gpa.create(XkbBinding);
errdefer xkb_binding.destroy();
errdefer utils.gpa.destroy(xkb_binding);
xkb_binding.* = .{
.xkb_binding_v1 = xkb_binding_v1,
@ -405,7 +405,7 @@ bindings: wl.list.Head(XkbBinding, .link),
pub fn create(context: *Context, xkb_bindings_v1: *river.XkbBindingsV1) !*XkbBindings {
const xkb_bindings = try utils.gpa.create(XkbBindings);
errdefer xkb_bindings.destroy();
errdefer utils.gpa.destroy(xkb_bindings);
xkb_bindings.* = .{
.context = context,