Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: fix segfault if font-family is reset via the CLI

Browse Source 
Fixes #4149
This commit is contained in:
Mitchell Hashimoto
2024-12-30 21:30:30 -08:00
committed by Jonathan Lopez
parent 3ba8d7f8fb
commit 4e0433f77f
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/Config.zig
View File

@ -2843,6 +2843,9 @@ pub fn loadCliArgs(self: *Config, alloc_gpa: Allocator) !void {
// replace the entire list with the new list. // replace the entire list with the new list.
inline for (fields, 0..) |field, i| { inline for (fields, 0..) |field, i| {
const v = &@field(self, field); const v = &@field(self, field);
// The list can be empty if it was reset, i.e. --font-family=""
if (v.list.items.len > 0) {
const len = v.list.items.len - counter[i]; const len = v.list.items.len - counter[i];
if (len > 0) { if (len > 0) {
// Note: we don't have to worry about freeing the memory // Note: we don't have to worry about freeing the memory
@ -2857,6 +2860,7 @@ pub fn loadCliArgs(self: *Config, alloc_gpa: Allocator) !void {
} }
} }
} }
}
// Config files loaded from the CLI args are relative to pwd // Config files loaded from the CLI args are relative to pwd
if (self.@"config-file".value.items.len > 0) { if (self.@"config-file".value.items.len > 0) {