qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make this not crash when compiled with -g.

Browse Source 
Found by myself, analysis by kurt@, fix by me with input from otto.

``Just get some fix in...'' deraadt
This commit is contained in:
mk 2008-06-16 19:09:48 +00:00
parent 7e03e79766
commit 3d8c29aa2b
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/cwm/conf.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: conf.c,v 1.40 2008/06/15 02:47:46 oga Exp $
* $Id: conf.c,v 1.41 2008/06/16 19:09:48 mk Exp $
*/
#include "headers.h"
@ -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

9
app/cwm/parse.y
View File

@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.12 2008/06/15 02:47:46 oga Exp $ */
/* $OpenBSD: parse.y,v 1.13 2008/06/16 19:09:48 mk Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -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)