mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-27 18:51:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Launcher: Fix UB when failing to launch because resolving the EXE fails

Browse Source
This commit is contained in:
Kovid Goyal
2021-12-22 07:32:28 +05:30
parent e49b20bfa7
commit b965fb4806
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher.c
View File

@@ -264,6 +264,7 @@ int main(int argc, char *argv[]) {
FREE_AFTER_FUNCTION const char *lc_ctype = NULL; FREE_AFTER_FUNCTION const char *lc_ctype = NULL;
#ifdef __APPLE__ #ifdef __APPLE__
lc_ctype = getenv("LC_CTYPE"); lc_ctype = getenv("LC_CTYPE");
if (lc_ctype) lc_ctype = strdup(lc_ctype);
#endif #endif
if (!read_exe_path(exe, sizeof(exe))) return 1; if (!read_exe_path(exe, sizeof(exe))) return 1;
strncpy(exe_dir_buf, exe, sizeof(exe_dir_buf)); strncpy(exe_dir_buf, exe, sizeof(exe_dir_buf));
@@ -277,7 +278,6 @@ int main(int argc, char *argv[]) {
// Always use UTF-8 mode, see https://github.com/kovidgoyal/kitty/issues/924 // Always use UTF-8 mode, see https://github.com/kovidgoyal/kitty/issues/924
Py_UTF8Mode = 1; Py_UTF8Mode = 1;
#endif #endif
if (lc_ctype) lc_ctype = strdup(lc_ctype);
RunData run_data = {.exe = exe, .exe_dir = exe_dir, .lib_dir = lib, .argc = argc, .argv = argv, .lc_ctype = lc_ctype}; RunData run_data = {.exe = exe, .exe_dir = exe_dir, .lib_dir = lib, .argc = argc, .argv = argv, .lc_ctype = lc_ctype};
ret = run_embedded(run_data); ret = run_embedded(run_data);
return ret; return ret;