From e1949aa69421ff6e8a540eb505ac5d00dee403a0 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 20 Sep 2011 21:42:09 +0100 Subject: [PATCH] Bugfix: Correctly split key/value when parsing variables (Thanks xeen) --- src/cfgparse.y | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cfgparse.y b/src/cfgparse.y index 10ca48cc..f8e84ae9 100644 --- a/src/cfgparse.y +++ b/src/cfgparse.y @@ -358,12 +358,14 @@ void parse_file(const char *f) { /* get key/value for this variable */ char *v_key = value, *v_value; - if ((v_value = strstr(value, " ")) == NULL && - (v_value = strstr(value, "\t")) == NULL) { + if (strstr(value, " ") == NULL && strstr(value, "\t") == NULL) { ELOG("Malformed variable assignment, need a value\n"); continue; } + if (!(v_value = strstr(value, " "))) + v_value = strstr(value, "\t"); + *(v_value++) = '\0'; struct Variable *new = scalloc(sizeof(struct Variable)); -- 2.39.5