Merge pull request #7 from utox39/fix-linux-gpu/fix-double-free
Fix linux gpu/fix double free
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
|
||||
// This is a [Semantic Version](https://semver.org/).
|
||||
// In a future version of Zig it will be used for package deduplication.
|
||||
.version = "0.7.2",
|
||||
.version = "0.7.3",
|
||||
|
||||
// Together with name, this represents a globally unique package
|
||||
// identifier. This field is generated by the Zig toolchain when the
|
||||
|
||||
@@ -144,9 +144,8 @@ pub fn getGpuInfo(allocator: std.mem.Allocator) !std.ArrayList(GpuInfo) {
|
||||
);
|
||||
|
||||
const gpu_name = try allocator.dupe(u8, std.mem.span(name));
|
||||
defer allocator.free(gpu_name);
|
||||
|
||||
const parsed_gpu_name = try parseGpuName(allocator, gpu_name);
|
||||
const parsed_gpu_name = try parseGpuName(allocator, gpu_name) orelse gpu_name;
|
||||
|
||||
try gpu_info_list.append(GpuInfo{
|
||||
.gpu_name = parsed_gpu_name,
|
||||
@@ -167,7 +166,7 @@ pub fn getGpuInfo(allocator: std.mem.Allocator) !std.ArrayList(GpuInfo) {
|
||||
return gpu_info_list;
|
||||
}
|
||||
|
||||
fn parseGpuName(allocator: std.mem.Allocator, name: []u8) ![]u8 {
|
||||
fn parseGpuName(allocator: std.mem.Allocator, name: []u8) !?[]u8 {
|
||||
// NOTE: for references: https://github.com/pciutils/pciutils/blob/master/pci.ids
|
||||
|
||||
if (std.mem.startsWith(u8, name, "Advanced Micro Devices, Inc. [AMD/ATI]")) {
|
||||
@@ -190,7 +189,7 @@ fn parseGpuName(allocator: std.mem.Allocator, name: []u8) ![]u8 {
|
||||
return parsed_gpu_name;
|
||||
}
|
||||
|
||||
return name;
|
||||
return null;
|
||||
}
|
||||
|
||||
pub fn getRamInfo(allocator: std.mem.Allocator) !RamInfo {
|
||||
|
||||
Reference in New Issue
Block a user