Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 16:26:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

termio: free envmap when able, fix memory leak (#5715)

Browse Source 
Caused by #5650

I actually don't understand how this didn't happen before or why we
didn't notice it but it seems like the envmap was never freed. In the
latest debug builds prior to this build GPA reports the leak.

We should free the envmap when the subprocess is deinitialized. But also
we can free the env map as soon as we start the subprocess which saves
some small amount of memory at runtime.

Additionally, we should only be freeing the envmap on error if we
created it.
This commit is contained in:
Mitchell Hashimoto
2025-02-12 09:00:56 -08:00
committed by GitHub
parent f2f0c6b4e9 9ea29dc508
commit 1bb87e14a5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/termio/Exec.zig
View File

@ -704,7 +704,7 @@ const Subprocess = struct {
arena: std.heap.ArenaAllocator,
cwd: ?[]const u8,
env: EnvMap,
env: ?EnvMap,
args: [][]const u8,
grid_size: renderer.GridSize,
screen_size: renderer.ScreenSize,
@ -725,7 +725,7 @@ const Subprocess = struct {
// Get our env. If a default env isn't provided by the caller
// then we get it ourselves.
var env = cfg.env orelse try internal_os.getEnvMap(alloc);
errdefer env.deinit();
errdefer if (cfg.env == null) env.deinit();
// If we have a resources dir then set our env var
if (cfg.resources_dir) |dir| {
@ -1054,6 +1054,7 @@ const Subprocess = struct {
pub fn deinit(self: *Subprocess) void {
self.stop();
if (self.pty) |*pty| pty.deinit();
if (self.env) |*env| env.deinit();
self.arena.deinit();
self.* = undefined;
}
@ -1136,7 +1137,7 @@ const Subprocess = struct {
var cmd: Command = .{
.path = self.args[0],
.args = self.args,
.env = &self.env,
.env = if (self.env) |*env| env else null,
.cwd = cwd,
.stdin = if (builtin.os.tag == .windows) null else .{ .handle = pty.slave },
.stdout = if (builtin.os.tag == .windows) null else .{ .handle = pty.slave },
@ -1170,6 +1171,12 @@ const Subprocess = struct {
_ = posix.close(pty.slave);
}
// Successful start we can clear out some memory.
if (self.env) |*env| {
env.deinit();
self.env = null;
}
self.command = cmd;
return switch (builtin.os.tag) {
.windows => .{