authorgravatar for 66840021+Mcrtin@users.noreply.github.comMartin <66840021+Mcrtin@users.noreply.github.com> 2026-10-17 20:51:01+02:00
committergravatar for 66840021+Mcrtin@users.noreply.github.comMartin <66840021+Mcrtin@users.noreply.github.com> 2026-10-17 20:51:01+02:00
log6fbb5ad328d180f6d397d0d64feb599a6570914b
tree9aa1810e1165dcaaea006032865980ec62ea29a4
parentf79dad493810e8c9338ccf3343468c001329e30f

std.json: audit usages of errdefer

1 files changed, 4 insertions(+), 6 deletions(-)

lib/std/json/Scanner.zig+4-6
...@@ -136,9 +136,8 @@ pub fn nextAllocMax(self: *@This(), allocator: Allocator, when: AllocWhen, max_v...@@ -136,9 +136,8 @@ pub fn nextAllocMax(self: *@This(), allocator: Allocator, when: AllocWhen, max_v
136 switch (token_type) {136 switch (token_type) {
137 .number, .string => {137 .number, .string => {
138 var value_list: std.ArrayList(u8) = .empty;138 var value_list: std.ArrayList(u8) = .empty;
139 errdefer {139 defer value_list.deinit(allocator);
140 value_list.deinit(allocator);140
141 }
142 if (self.allocNextIntoArrayListMax(allocator, &value_list, when, max_value_len) catch |e| switch (e) {141 if (self.allocNextIntoArrayListMax(allocator, &value_list, when, max_value_len) catch |e| switch (e) {
143 error.BufferUnderrun => unreachable,142 error.BufferUnderrun => unreachable,
144 else => |err| return err,143 else => |err| return err,
...@@ -1608,9 +1607,8 @@ pub const Reader = struct {...@@ -1608,9 +1607,8 @@ pub const Reader = struct {
1608 switch (token_type) {1607 switch (token_type) {
1609 .number, .string => {1608 .number, .string => {
1610 var value_list: std.ArrayList(u8) = .empty;1609 var value_list: std.ArrayList(u8) = .empty;
1611 errdefer {1610 defer value_list.deinit(allocator);
1612 value_list.deinit(allocator);1611
1613 }
1614 if (try self.allocNextIntoArrayListMax(allocator, &value_list, when, max_value_len)) |slice| {1612 if (try self.allocNextIntoArrayListMax(allocator, &value_list, when, max_value_len)) |slice| {
1615 return if (token_type == .number)1613 return if (token_type == .number)
1616 Token{ .number = slice }1614 Token{ .number = slice }