andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #271 from InterplanetaryEngineer/master

Browse Source 
Fix memory leaks
This commit is contained in:
Alexandros Naskos 2021-03-30 03:44:41 -07:00 committed by GitHub
commit afc6d1fd1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/document_store.zig
View File

@ -390,8 +390,8 @@ fn refreshDocument(self: *DocumentStore, handle: *Handle, zig_lib_path: ?[]const
} }
log.debug("Import removed: {s}", .{old}); log.debug("Import removed: {s}", .{old});
self.decrementCount(old); self.decrementCount(old);
self.allocator.free(old);
} }
self.allocator.free(old);
} }
} }

37
src/main.zig
View File

@ -1672,7 +1672,9 @@ fn processJsonRpc(arena: *std.heap.ArenaAllocator, parser: *std.json.Parser, jso
logger.debug("Method without return value not implemented: {s}", .{method}); logger.debug("Method without return value not implemented: {s}", .{method});
} }
var gpa_state = std.heap.GeneralPurposeAllocator(.{}){}; const stack_frames = switch (std.builtin.mode) { .Debug => 10, else => 0 };
var gpa_state = std.heap.GeneralPurposeAllocator(.{ .stack_trace_frames = stack_frames }){};
pub fn main() anyerror!void { pub fn main() anyerror!void {
defer _ = gpa_state.deinit(); defer _ = gpa_state.deinit();
allocator = &gpa_state.allocator; allocator = &gpa_state.allocator;
@ -1703,15 +1705,7 @@ pub fn main() anyerror!void {
const config_parse_options = std.json.ParseOptions{ .allocator = allocator }; const config_parse_options = std.json.ParseOptions{ .allocator = allocator };
var config = Config{}; var config = Config{};
var config_had_null_zig_path = config.zig_exe_path == null; var config_had_null_zig_path = config.zig_exe_path == null;
defer { defer std.json.parseFree(Config, config, config_parse_options);
if (config_had_null_zig_path) {
if (config.zig_exe_path) |exe_path| {
allocator.free(exe_path);
config.zig_exe_path = null;
}
}
std.json.parseFree(Config, config, config_parse_options);
}
config_read: { config_read: {
const res = try known_folders.getPath(allocator, .local_configuration); const res = try known_folders.getPath(allocator, .local_configuration);
@ -1736,17 +1730,12 @@ pub fn main() anyerror!void {
find_zig: { find_zig: {
if (config.zig_exe_path) |exe_path| { if (config.zig_exe_path) |exe_path| {
if (std.fs.path.isAbsolute(exe_path)) { if (std.fs.path.isAbsolute(exe_path)) not_valid: {
zig_exe_path = try std.mem.dupe(allocator, u8, exe_path); std.fs.cwd().access(exe_path, .{}) catch break :not_valid;
// make sure the path still exists break :find_zig;
if (blk: {
std.fs.cwd().access(zig_exe_path.?, .{}) catch break :blk false;
break :blk true;
})
break :find_zig;
} }
logger.debug("zig path `{s}` is not absolute, will look in path", .{exe_path}); logger.debug("zig path `{s}` is not absolute, will look in path", .{exe_path});
allocator.free(exe_path);
} }
const env_path = std.process.getEnvVarOwned(allocator, "PATH") catch |err| switch (err) { const env_path = std.process.getEnvVarOwned(allocator, "PATH") catch |err| switch (err) {
@ -1758,7 +1747,7 @@ pub fn main() anyerror!void {
}; };
defer allocator.free(env_path); defer allocator.free(env_path);
const exe_extension = @as(std.zig.CrossTarget, .{}).exeFileExt(); const exe_extension = std.Target.current.exeFileExt();
const zig_exe = try std.fmt.allocPrint(allocator, "zig{s}", .{exe_extension}); const zig_exe = try std.fmt.allocPrint(allocator, "zig{s}", .{exe_extension});
defer allocator.free(zig_exe); defer allocator.free(zig_exe);
@ -1771,15 +1760,15 @@ pub fn main() anyerror!void {
defer allocator.free(full_path); defer allocator.free(full_path);
var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined; var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
zig_exe_path = try std.mem.dupe(allocator, u8, std.os.realpath(full_path, &buf) catch continue); config.zig_exe_path = try std.mem.dupe(allocator, u8, std.os.realpath(full_path, &buf) catch continue);
logger.info("Found zig in PATH: {s}", .{zig_exe_path}); logger.info("Found zig in PATH: {s}", .{config.zig_exe_path});
break :find_zig; break :find_zig;
} }
} }
if (zig_exe_path) |exe_path| { if (config.zig_exe_path) |exe_path| {
config.zig_exe_path = exe_path;
logger.info("Using zig executable {s}", .{exe_path}); logger.info("Using zig executable {s}", .{exe_path});
if (config.zig_lib_path == null) find_lib_path: { if (config.zig_lib_path == null) find_lib_path: {
// Use `zig env` to find the lib path // Use `zig env` to find the lib path
const zig_env_result = try std.ChildProcess.exec(.{ const zig_env_result = try std.ChildProcess.exec(.{