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

Use ISTRDUP to check before copying string in rule conf parse

Browse Source
This commit is contained in:
Martin Duquesnoy 2011-11-03 18:14:31 +01:00
parent 12434ad225
commit 339649ed74
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/config.c
View File

@ -143,6 +143,11 @@ config_tag(void)
free(ks); free(ks);
} }
#define ISTRDUP(t, s) \
do { \
if((tmp = s)) \
t = xstrdup(tmp); \
} while(/* CONSTCOND */ 0);
static void static void
config_rule(void) config_rule(void)
{ {
@ -150,7 +155,7 @@ config_rule(void)
struct conf_sec *sec, **ks; struct conf_sec *sec, **ks;
struct rule *r; struct rule *r;
struct theme *t; struct theme *t;
char *tn; char *tn, *tmp;
/* [rules] */ /* [rules] */
sec = fetch_section_first(NULL, "rules"); sec = fetch_section_first(NULL, "rules");
@ -164,10 +169,11 @@ config_rule(void)
{ {
r = (struct rule*)xcalloc(1, sizeof(struct rule)); r = (struct rule*)xcalloc(1, sizeof(struct rule));
r->class = xstrdup(fetch_opt_first(ks[i], "", "class").str); ISTRDUP(r->class, fetch_opt_first(ks[i], "", "class").str);
r->instance = xstrdup(fetch_opt_first(ks[i], "", "instance").str); ISTRDUP(r->instance, fetch_opt_first(ks[i], "", "instance").str);
r->role = xstrdup(fetch_opt_first(ks[i], "", "role").str); ISTRDUP(r->role, fetch_opt_first(ks[i], "", "role").str);
r->name = xstrdup(fetch_opt_first(ks[i], "", "name").str); ISTRDUP(r->name , fetch_opt_first(ks[i], "", "name").str);
r->screen = fetch_opt_first(ks[i], "-1", "screen").num; r->screen = fetch_opt_first(ks[i], "-1", "screen").num;
r->tag = fetch_opt_first(ks[i], "-1", "tag").num; r->tag = fetch_opt_first(ks[i], "-1", "tag").num;