Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more padding to parse buffer

Browse Source
This commit is contained in:
Suirad 2018-11-24 19:21:12 -06:00
parent 0abd5520bd
commit 24592d0216
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
std/os/index.zig
View File

@ -718,8 +718,9 @@ pub fn getEnvMap(allocator: *Allocator) !BufMap {
var key: []u8 = undefined; var key: []u8 = undefined;
var heap_key = false; var heap_key = false;
// parse the key on the stack if smaller than 'stack_var_len' /// revisit needing the "-@sizeof(usize)*2"
if (key_slice.len < stack_var_len-@sizeOf(usize)) { /// after https://github.com/ziglang/zig/issues/1774
if (key_slice.len < stack_var_len-@sizeOf(usize)*2) {
var buf = []u8{0} ** stack_var_len; var buf = []u8{0} ** stack_var_len;
var fallocator = &std.heap.FixedBufferAllocator.init(buf[0..]).allocator; var fallocator = &std.heap.FixedBufferAllocator.init(buf[0..]).allocator;
key = try std.unicode.utf16leToUtf8Alloc(fallocator, key_slice); key = try std.unicode.utf16leToUtf8Alloc(fallocator, key_slice);
@ -737,7 +738,9 @@ pub fn getEnvMap(allocator: *Allocator) !BufMap {
var value: []u8 = undefined; var value: []u8 = undefined;
var heap_value = false; var heap_value = false;
if (value_slice.len < stack_var_len-@sizeOf(usize)) { /// revisit needing the "-@sizeof(usize)*2"
/// after https://github.com/ziglang/zig/issues/1774
if (value_slice.len < stack_var_len-@sizeOf(usize)*2) {
var buf = []u8{0} ** stack_var_len; var buf = []u8{0} ** stack_var_len;
var fallocator = &std.heap.FixedBufferAllocator.init(buf[0..]).allocator; var fallocator = &std.heap.FixedBufferAllocator.init(buf[0..]).allocator;
value = try std.unicode.utf16leToUtf8Alloc(fallocator, value_slice); value = try std.unicode.utf16leToUtf8Alloc(fallocator, value_slice);