diff options
| -rw-r--r-- | calmwm.c | 1 | ||||
| -rw-r--r-- | parse.y | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/calmwm.c b/calmwm.c index 9821b58..bfba638 100644 --- a/calmwm.c +++ b/calmwm.c @@ -81,6 +81,7 @@ main(int argc, char **argv) group_init(); Starting = 1; + bzero(&Conf, sizeof(Conf)); conf_setup(&Conf, conffile); client_setup(); x_setup(display_name); diff --git a/parse.y b/parse.y index bb5e44c..7322bbe 100644 --- a/parse.y +++ b/parse.y @@ -513,8 +513,7 @@ parse_config(const char *filename, struct conf *xconf) { int errors = 0; - if ((conf = malloc(sizeof(struct conf))) == NULL) - return (-1); + XCALLOC(conf, struct conf); if ((file = pushfile(filename)) == NULL) { free(conf); |