Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: handle alloc failure in Mapping init

Browse Source
This commit is contained in:
Isaac Freund 2020-08-21 20:06:26 +02:00
parent c7c1934b70
commit 4a334829f3
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
river/Mapping.zig
View File

@ -31,8 +31,12 @@ pub fn init(
modifiers: u32, modifiers: u32,
command_args: []const []const u8, command_args: []const []const u8,
) !Self { ) !Self {
var owned_args = try allocator.alloc([]u8, command_args.len); const owned_args = try allocator.alloc([]u8, command_args.len);
for (command_args) |arg, i| owned_args[i] = try std.mem.dupe(allocator, u8, arg); errdefer allocator.free(owned_args);
for (command_args) |arg, i| {
errdefer for (owned_args[0..i]) |a| allocator.free(a);
owned_args[i] = try std.mem.dupe(allocator, u8, arg);
}
return Self{ return Self{
.keysym = keysym, .keysym = keysym,
.modifiers = modifiers, .modifiers = modifiers,