mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-14 04:24:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make use of realpath() safer

Browse Source
This commit is contained in:
Kovid Goyal
2019-05-01 07:55:03 +05:30
parent 7622cbaed5
commit a2f589be00
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
linux-launcher.c
View File

@@ -24,6 +24,16 @@
#define MIN(x, y) ((x) < (y)) ? (x) : (y) #define MIN(x, y) ((x) < (y)) ? (x) : (y)
#define MAX_ARGC 1024 #define MAX_ARGC 1024
static inline bool
safe_realpath(const char* src, char *buf, size_t buf_sz) {
char* ans = realpath(src, NULL);
if (ans == NULL) return false;
snprintf(buf, buf_sz, "%s", ans);
free(ans);
return true;
}
#ifdef FOR_BUNDLE #ifdef FOR_BUNDLE
static int run_embedded(const char* exe_dir_, int argc, wchar_t **argv) { static int run_embedded(const char* exe_dir_, int argc, wchar_t **argv) {
int num; int num;
@@ -80,6 +90,7 @@ end:
#else #else
static int run_embedded(const char* exe_dir, int argc, wchar_t **argv) { static int run_embedded(const char* exe_dir, int argc, wchar_t **argv) {
(void)exe_dir;
return Py_Main(argc, argv); return Py_Main(argc, argv);
} }
@@ -92,7 +103,7 @@ read_exe_path(char *exe, size_t buf_sz) {
uint32_t size = PATH_MAX; uint32_t size = PATH_MAX;
char apple[PATH_MAX+1] = {0}; char apple[PATH_MAX+1] = {0};
if (_NSGetExecutablePath(apple, &size) != 0) { fprintf(stderr, "Failed to get path to executable\n"); return false; } if (_NSGetExecutablePath(apple, &size) != 0) { fprintf(stderr, "Failed to get path to executable\n"); return false; }
if (realpath(apple, exe) == NULL) { fprintf(stderr, "realpath() failed on the executable's path\n"); return false; } if (!safe_realpath(apple, exe, buf_sz)) { fprintf(stderr, "realpath() failed on the executable's path\n"); return false; }
return true; return true;
} }
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
@@ -114,7 +125,7 @@ read_exe_path(char *exe, size_t buf_sz) {
static inline bool static inline bool
read_exe_path(char *exe, size_t buf_sz) { read_exe_path(char *exe, size_t buf_sz) {
if (realpath("/proc/curproc/exe", exe) == NULL) { fprintf(stderr, "Failed to read /proc/self/exe\n"); return false; } if (!safe_realpath("/proc/curproc/exe", exe, buf_sz)) { fprintf(stderr, "Failed to read /proc/self/exe\n"); return false; }
return true; return true;
} }
@@ -122,7 +133,7 @@ read_exe_path(char *exe, size_t buf_sz) {
static inline bool static inline bool
read_exe_path(char *exe, size_t buf_sz) { read_exe_path(char *exe, size_t buf_sz) {
if (realpath("/proc/self/exe", exe) == NULL) { fprintf(stderr, "Failed to read /proc/self/exe\n"); return false; } if (!safe_realpath("/proc/self/exe", exe, buf_sz)) { fprintf(stderr, "Failed to read /proc/self/exe\n"); return false; }
return true; return true;
} }
#endif #endif