mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: Prevent null pointer deref in mem.len{,Z}

Browse Source 
Closes #8140
This commit is contained in:
LemonBoy 2021-03-05 22:08:34 +01:00 committed by Veikka Tuominen
parent 6d69a29d75
commit e47b754b28
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/std/mem.zig
View File

@ -647,7 +647,10 @@ pub fn len(value: anytype) usize {
indexOfSentinel(info.child, sentinel, value)
else
@compileError("length of pointer with no sentinel"),
.C => indexOfSentinel(info.child, 0, value),
.C => {
assert(value != null);
return indexOfSentinel(info.child, 0, value);
},
.Slice => value.len,
},
.Struct => |info| if (info.is_tuple) {
@ -708,7 +711,10 @@ pub fn lenZ(ptr: anytype) usize {
indexOfSentinel(info.child, sentinel, ptr)
else
@compileError("length of pointer with no sentinel"),
.C => indexOfSentinel(info.child, 0, ptr),
.C => {
assert(ptr != null);
return indexOfSentinel(info.child, 0, ptr);
},
.Slice => if (info.sentinel) |sentinel|
indexOfSentinel(info.child, sentinel, ptr.ptr)
else