diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-01-02 08:15:52 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-01-02 08:15:52 +0000 |
| commit | 99ebff5a515c4645e2faa32fd51e975e60d95ddb (patch) | |
| tree | 5084aa2a518cdac3536517c8c976c1dfedd11bb4 | |
| parent | doc: ctlseq: add missing ‘[‘ to a couple of CSI sequences (diff) | |
| parent | changelog: fixed failing to launch when exec(3):ed with an empty argv (diff) | |
Merge branch 'argc-is-zero'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | client.c | 8 | ||||
| -rw-r--r-- | main.c | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1eb4f719..9caf6c82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,6 +79,7 @@ characters (e.g. emojis). * Rendering of CSD borders when `csd.border-width > 0` and desktop scaling has been enabled. +* Failure to launch when `exec(3)’:ed with an empty argv. ### Security @@ -124,7 +124,7 @@ main(int argc, char *const *argv) static const int foot_exit_failure = -36; int ret = foot_exit_failure; - const char *const prog_name = argv[0]; + const char *const prog_name = argc > 0 ? argv[0] : "<nullptr>"; static const struct option longopts[] = { {"term", required_argument, NULL, 't'}, @@ -309,8 +309,10 @@ main(int argc, char *const *argv) } } - argc -= optind; - argv += optind; + if (argc > 0) { + argc -= optind; + argv += optind; + } log_init(log_colorize, false, LOG_FACILITY_USER, log_level); @@ -168,7 +168,7 @@ main(int argc, char *const *argv) * don't pass this on to programs launched by us */ unsetenv("DESKTOP_STARTUP_ID"); - const char *const prog_name = argv[0]; + const char *const prog_name = argc > 0 ? argv[0] : "<nullptr>"; static const struct option longopts[] = { {"config", required_argument, NULL, 'c'}, @@ -401,8 +401,10 @@ main(int argc, char *const *argv) as_server && log_syslog, (enum fcft_log_class)log_level); - argc -= optind; - argv += optind; + if (argc > 0) { + argc -= optind; + argv += optind; + } LOG_INFO("%s", version_and_features()); |
