superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macOS: properly handle buffer allocation in ZH locale canonicalization (#8137) 

Fix a bug introduced by #6885 

`fixZhLocale` returns locale string literal without copying it into the
buffer, causing the `LANGUAGE` environment variable to be set
incorrectly.
```log
$ LANG="" zig build run
...
debug(os_locale): setting LANGUAGE from preferred languages value=�����.UTF-8:�����.UTF-8:en_US.UTF-8:ja_CN.UTF-8
...
```
pull/8156/head
Mitchell Hashimoto 2025-08-05 09:41:15 -07:00 committed by GitHub
parent 5c0e15f50f c1060d56b3
commit 70ec59d566
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/os/i18n.zig
View File

@ -133,7 +133,12 @@ pub fn canonicalizeLocale(
locale: []const u8, locale: []const u8,
) error{NoSpaceLeft}![:0]const u8 { ) error{NoSpaceLeft}![:0]const u8 {
// Fix zh locales for macOS // Fix zh locales for macOS
if (fixZhLocale(locale)) |fixed| return fixed; if (fixZhLocale(locale)) |fixed| {
if (buf.len < fixed.len + 1) return error.NoSpaceLeft;
@memcpy(buf[0..fixed.len], fixed);
buf[fixed.len] = 0;
return buf[0..fixed.len :0];
}
// Buffer must be 16 or at least as long as the locale and null term // Buffer must be 16 or at least as long as the locale and null term
if (buf.len < @max(16, locale.len + 1)) return error.NoSpaceLeft; if (buf.len < @max(16, locale.len + 1)) return error.NoSpaceLeft;