From 9f7f4c40e47ec3578ab1ef204af331f984c0629b Mon Sep 17 00:00:00 2001 From: Philippe Pepiot Date: Tue, 13 Apr 2010 22:48:50 +0200 Subject: [PATCH] Fix segfault when fetch_opt on a NULL section --- src/parse/parse.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/parse/parse.c b/src/parse/parse.c index 01978c7..ead3605 100644 --- a/src/parse/parse.c +++ b/src/parse/parse.c @@ -448,12 +448,12 @@ fetch_opt_first(struct conf_sec *s, char *dfl, char *name) { struct conf_opt *o; - if (!name || !s) + if (!name) return opt_type_null; - - SLIST_FOREACH(o, &s->optlist, entry) - if (!strcmp(o->name, name)) - return string_to_opt(o->val[0]); + else if (s) + SLIST_FOREACH(o, &s->optlist, entry) + if (!strcmp(o->name, name)) + return string_to_opt(o->val[0]); return string_to_opt(dfl); }