mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 13:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

sema: fix OOM bug when constructing error messages

Browse Source
This commit is contained in:
dweiller 2024-01-15 15:33:41 +11:00
parent 9097bcc06e
commit 1861423862
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/Sema.zig
View File

@ -28657,7 +28657,7 @@ fn coerceExtra(
if (!dest_info.flags.is_const) {
const err_msg = err_msg: {
const err_msg = try sema.errMsg(block, inst_src, "cannot cast pointer to tuple to '{}'", .{dest_ty.fmt(mod)});
errdefer err_msg.deinit(sema.gpa);
errdefer err_msg.destroy(sema.gpa);
try sema.errNote(block, dest_ty_src, err_msg, "pointers to tuples can only coerce to constant pointers", .{});
break :err_msg err_msg;
};
@ -32599,31 +32599,39 @@ fn analyzeSlice(
if (try sema.compareScalar(start_value, .neq, end_value, Type.comptime_int)) {
if (try sema.compareScalar(start_value, .neq, Value.zero_comptime_int, Type.comptime_int)) {
const err_msg = try sema.errMsg(block, start_src, bounds_error_message, .{});
try sema.errNote(
block,
start_src,
err_msg,
"expected '{}', found '{}'",
.{
Value.zero_comptime_int.fmtValue(Type.comptime_int, mod),
start_value.fmtValue(Type.comptime_int, mod),
},
);
return sema.failWithOwnedErrorMsg(block, err_msg);
const msg = msg: {
const msg = try sema.errMsg(block, start_src, bounds_error_message, .{});
errdefer msg.destroy(sema.gpa);
try sema.errNote(
block,
start_src,
msg,
"expected '{}', found '{}'",
.{
Value.zero_comptime_int.fmtValue(Type.comptime_int, mod),
start_value.fmtValue(Type.comptime_int, mod),
},
);
break :msg msg;
};
return sema.failWithOwnedErrorMsg(block, msg);
} else if (try sema.compareScalar(end_value, .neq, Value.one_comptime_int, Type.comptime_int)) {
const err_msg = try sema.errMsg(block, end_src, bounds_error_message, .{});
try sema.errNote(
block,
end_src,
err_msg,
"expected '{}', found '{}'",
.{
Value.one_comptime_int.fmtValue(Type.comptime_int, mod),
end_value.fmtValue(Type.comptime_int, mod),
},
);
return sema.failWithOwnedErrorMsg(block, err_msg);
const msg = msg: {
const msg = try sema.errMsg(block, end_src, bounds_error_message, .{});
errdefer msg.destroy(sema.gpa);
try sema.errNote(
block,
end_src,
msg,
"expected '{}', found '{}'",
.{
Value.one_comptime_int.fmtValue(Type.comptime_int, mod),
end_value.fmtValue(Type.comptime_int, mod),
},
);
break :msg msg;
};
return sema.failWithOwnedErrorMsg(block, msg);
}
} else {
if (try sema.compareScalar(end_value, .gt, Value.one_comptime_int, Type.comptime_int)) {