Skip to content

sema: add OOB safety check for by-length slice of array #18598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/Sema.zig
Original file line number Diff line number Diff line change
Expand Up @@ -33094,19 +33094,23 @@ fn analyzeSlice(
try sema.addSafetyCheck(block, src, is_non_null, .unwrap_null);
}

if (slice_ty.isSlice(mod)) {
const opt_len_inst = if (array_ty.zigTypeTag(mod) == .Array)
try mod.intRef(Type.usize, array_ty.arrayLenIncludingSentinel(mod))
else if (slice_ty.isSlice(mod)) blk: {
const slice_len_inst = try block.addTyOp(.slice_len, Type.usize, ptr_or_slice);
const actual_len = if (slice_ty.sentinel(mod) == null)
slice_len_inst
else
try sema.analyzeArithmetic(block, .add, slice_len_inst, .one, src, end_src, end_src, true);

break :blk actual_len;
} else null;
if (opt_len_inst) |len_inst| {
const actual_end = if (slice_sentinel != null)
try sema.analyzeArithmetic(block, .add, end, .one, src, end_src, end_src, true)
else
end;

try sema.panicIndexOutOfBounds(block, src, actual_end, actual_len, .cmp_lte);
try sema.panicIndexOutOfBounds(block, src, actual_end, len_inst, .cmp_lte);
}

// requirement: result[new_len] == slice_sentinel
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
const std = @import("std");

pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace, _: ?usize) noreturn {
_ = stack_trace;
if (std.mem.eql(u8, message, "index out of bounds: index 16, len 5")) {
std.process.exit(0);
}
std.process.exit(1);
}

pub fn main() !void {
var buf: [5]u8 = undefined;
var a: u32 = 6;
_ = &a;
_ = buf[a..][0..10];
return error.TestFailed;
}
// run
// backend=llvm
// target=native
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
const std = @import("std");

pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace, _: ?usize) noreturn {
_ = stack_trace;
if (std.mem.eql(u8, message, "index out of bounds: index 16, len 5")) {
std.process.exit(0);
}
std.process.exit(1);
}

pub fn main() !void {
var buf: [5]u8 = undefined;
var a: u32 = 6;
_ = &a;
var len: u32 = 10;
_ = &len;
_ = buf[a..][0..len];
return error.TestFailed;
}
// run
// backend=llvm
// target=native