mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-13 09:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure llvm strings are null-terminated

Browse Source
This commit is contained in:
Layne Gustafson 2020-01-08 23:14:25 -05:00 committed by Andrew Kelley
parent fd17a9962b
commit ebb6f15bba
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src-self-hosted/stage1.zig
View File

@ -617,6 +617,15 @@ fn printCpusForArch(arch_name: []const u8, show_dependencies: bool) !void {
} }
} }
fn toNullTerminatedStringAlloc(allocator: *std.mem.Allocator, str: []const u8) ![:0]const u8 {
var buffer = try std.Buffer.init(allocator, str);
const len = buffer.len();
// Don't deinit since we steal all the buffer's memory here.
return buffer.list.toOwnedSlice()[0..len :0];
}
const Stage2TargetDetails = struct { const Stage2TargetDetails = struct {
allocator: *std.mem.Allocator, allocator: *std.mem.Allocator,
target_details: std.target.TargetDetails, target_details: std.target.TargetDetails,
@ -643,8 +652,8 @@ const Stage2TargetDetails = struct {
.target_details = .{ .target_details = .{
.cpu = cpu, .cpu = cpu,
}, },
.llvm_cpu_str = cpu.name, .llvm_cpu_str = try toNullTerminatedStringAlloc(allocator, cpu.name),
.llvm_features_str = "", .llvm_features_str = try toNullTerminatedStringAlloc(allocator, ""),
.builtin_str = builtin_str_buffer.toOwnedSlice(), .builtin_str = builtin_str_buffer.toOwnedSlice(),
}; };
} }
@ -672,13 +681,16 @@ const Stage2TargetDetails = struct {
try builtin_str_buffer.append("}};"); try builtin_str_buffer.append("}};");
// This is needed here because llvm_features_buffer.len() is no longer valid after toOwnedSlice().
const llvm_features_buffer_len = llvm_features_buffer.len();
return Self{ return Self{
.allocator = allocator, .allocator = allocator,
.target_details = std.target.TargetDetails{ .target_details = std.target.TargetDetails{
.features = features, .features = features,
}, },
.llvm_cpu_str = "", .llvm_cpu_str = try toNullTerminatedStringAlloc(allocator, ""),
.llvm_features_str = llvm_features_buffer.toOwnedSlice(), .llvm_features_str = llvm_features_buffer.toOwnedSlice()[0..llvm_features_buffer_len :0],
.builtin_str = builtin_str_buffer.toOwnedSlice(), .builtin_str = builtin_str_buffer.toOwnedSlice(),
}; };
} }