aboutsummaryrefslogtreecommitdiff
path: root/sway/config
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2018-07-01 23:22:21 +0900
committerDominique Martinet <asmadeus@codewreck.org>2018-07-02 08:03:41 +0900
commit248ea93c1af7eae5a57c354b0e2e50898f57b17d (patch)
tree813f482d8b60c005cda6968223ff132397040859 /sway/config
parente67c8cf1cb6c09f96bc091612b4eb75aea857452 (diff)
downloadsway-248ea93c1af7eae5a57c354b0e2e50898f57b17d.tar.xz
bar config: fix uninitialized accesses on init error
If init fails halfway through it will call the destroy function, which needs some coherent stuff filled. Allocate with calloc and fill in what cannot fail first Found through static analysis.
Diffstat (limited to 'sway/config')
-rw-r--r--sway/config/bar.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/sway/config/bar.c b/sway/config/bar.c
index e790c911..b97076a0 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -70,16 +70,12 @@ void free_bar_config(struct bar_config *bar) {
struct bar_config *default_bar_config(void) {
struct bar_config *bar = NULL;
- bar = malloc(sizeof(struct bar_config));
+ bar = calloc(1, sizeof(struct bar_config));
if (!bar) {
return NULL;
}
- if (!(bar->mode = strdup("dock"))) goto cleanup;
- if (!(bar->hidden_state = strdup("hide"))) goto cleanup;
bar->outputs = NULL;
bar->position = strdup("bottom");
- if (!(bar->bindings = create_list())) goto cleanup;
- if (!(bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p'; sleep 1; done"))) goto cleanup;
bar->pango_markup = false;
bar->swaybar_command = NULL;
bar->font = NULL;
@@ -91,6 +87,19 @@ struct bar_config *default_bar_config(void) {
bar->binding_mode_indicator = true;
bar->verbose = false;
bar->pid = 0;
+ if (!(bar->mode = strdup("dock"))) {
+ goto cleanup;
+ }
+ if (!(bar->hidden_state = strdup("hide"))) {
+ goto cleanup;
+ }
+ if (!(bar->bindings = create_list())) {
+ goto cleanup;
+ }
+ if (!(bar->status_command =
+ strdup("while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done"))) {
+ goto cleanup;
+ }
// set default colors
if (!(bar->colors.background = strndup("#000000ff", 9))) {
goto cleanup;