diff options
| author | mk <mk> | 2008-06-16 19:09:48 +0000 |
|---|---|---|
| committer | mk <mk> | 2008-06-16 19:09:48 +0000 |
| commit | 867652c484176909c61c74f59ba240039c8b9a1b (patch) | |
| tree | 467b3386766f07163a74f7faa52ece07077c36c8 | |
| parent | 07cd0b1ac55f819f42b2936339843bb85e7630bb (diff) | |
| download | cwm-867652c484176909c61c74f59ba240039c8b9a1b.tar.gz cwm-867652c484176909c61c74f59ba240039c8b9a1b.tar.xz cwm-867652c484176909c61c74f59ba240039c8b9a1b.zip | |
Make this not crash when compiled with -g.
Found by myself, analysis by kurt@, fix by me with input from otto. ``Just get some fix in...'' deraadt
| -rw-r--r-- | conf.c | 2 | ||||
| -rw-r--r-- | parse.y | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/conf.c b/conf.c index 2f65efa..f05390c 100644 --- a/conf.c +++ b/conf.c @@ -171,7 +171,7 @@ conf_init(struct conf *c) strlcpy(c->termpath, "xterm", sizeof(c->termpath)); strlcpy(c->lockpath, "xlock", sizeof(c->lockpath)); - c->DefaultFontName = DEFAULTFONTNAME; + c->DefaultFontName = xstrdup(DEFAULTFONTNAME); } void diff --git a/parse.y b/parse.y index 98903e4..82ca689 100644 --- a/parse.y +++ b/parse.y @@ -100,11 +100,8 @@ yesno : YES { $$ = 1; } ; main : FONTNAME STRING { - if (conf->DefaultFontName != NULL && - conf->DefaultFontName != DEFAULTFONTNAME) - free(conf->DefaultFontName); - conf->DefaultFontName = xstrdup($2); - free($2); + free(conf->DefaultFontName); + conf->DefaultFontName = $2; } | STICKY yesno { if ($2 == 0) |