diff options
| author | Craig Barnes <craigbarnes@protonmail.com> | 2020-08-08 19:34:30 +0000 |
|---|---|---|
| committer | Craig Barnes <craigbarnes@protonmail.com> | 2020-08-08 19:37:57 +0000 |
| commit | 7a77958ba20c2b344be5e66e69e2f212a4bbf6b3 (patch) | |
| tree | cdb8191177f5f9ca69ea7858f9543f36fcbcf616 /main.c | |
| parent | changelog: add birger to 'contributers' for the upcoming release (diff) | |
Convert most dynamic allocations to use functions from xmalloc.h
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -28,6 +28,7 @@ #include "shm.h" #include "terminal.h" #include "version.h" +#include "xmalloc.h" static volatile sig_atomic_t aborted = 0; @@ -341,15 +342,15 @@ main(int argc, char *const *argv) if (conf_term != NULL) { free(conf.term); - conf.term = strdup(conf_term); + conf.term = xstrdup(conf_term); } if (conf_title != NULL) { free(conf.title); - conf.title = strdup(conf_title); + conf.title = xstrdup(conf_title); } if (conf_app_id != NULL) { free(conf.app_id); - conf.app_id = strdup(conf_app_id); + conf.app_id = xstrdup(conf_app_id); } if (login_shell) conf.login_shell = true; @@ -367,7 +368,7 @@ main(int argc, char *const *argv) conf.height = conf_height; if (conf_server_socket_path != NULL) { free(conf.server_socket_path); - conf.server_socket_path = strdup(conf_server_socket_path); + conf.server_socket_path = xstrdup(conf_server_socket_path); } if (maximized) conf.startup_mode = STARTUP_MAXIMIZED; @@ -389,7 +390,7 @@ main(int argc, char *const *argv) errno = 0; size_t buf_len = 1024; do { - cwd = realloc(cwd, buf_len); + cwd = xrealloc(cwd, buf_len); if (getcwd(cwd, buf_len) == NULL && errno != ERANGE) { LOG_ERRNO("failed to get current working directory"); goto out; |
