godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wmfs/Conf: Fix segfault if there is no tag {} section.

Browse Source
This commit is contained in:
Martin Duquesnoy 2009-07-29 23:12:26 +02:00
parent 7097296cc8
commit 7eceb99dee
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/config.c
View File

@ -347,10 +347,14 @@ conf_tag_section(cfg_t *cfg_t)
/* Alloc all */
conf.ntag = emalloc(screen_count(), sizeof(int));
tags = emalloc(screen_count(), sizeof(Tag*));
tags = emalloc(screen_count(), sizeof(Tag*));
seltag = emalloc(screen_count(), sizeof(int));
for(i = 0; i < screen_count(); ++i)
tags[i] = emalloc(cfg_size(cfg_t, "tag") + 1, sizeof(Tag));
seltag[i] = 1;
for(i = 0; i < screen_count(); ++i)
tags[i] = emalloc(cfg_size(cfg_t, "tag") + 2, sizeof(Tag));
for(i = 0; i < cfg_size(cfg_t, "tag"); ++i)
{
@ -407,11 +411,6 @@ conf_tag_section(cfg_t *cfg_t)
tags[i][1] = default_tag;
}
seltag = emalloc(screen_count(), sizeof(int));
for(j = 0; j < screen_count(); ++j)
seltag[j] = 1;
return;
}
@ -423,8 +422,7 @@ conf_menu_section(cfg_t *cfg_m)
conf.nmenu = cfg_size(cfg_m, "set_menu");
CHECK(conf.nmenu);
conf.menu = emalloc(conf.nmenu, sizeof(Menu));
conf.menu = calloc(conf.nmenu, sizeof(Menu));
for(i = 0; i < conf.nmenu; ++i)
{