From: Max Kellermann <max.kellermann@gmail.com>
Date: Tue, 28 Mar 2017 20:52:22 +0000 (+0200)
Subject: conf: extract name and value from the input line in-place
X-Git-Tag: v0.28~27
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4d99dc2551cff45f30cff7103adf97fb1b41d9fc;p=ncmpc.git

conf: extract name and value from the input line in-place

No copies to a stack buffer.
---

diff --git a/src/conf.c b/src/conf.c
index ae362f1..b8e9c5d 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -121,6 +121,29 @@ print_error(const char *msg, const char *input)
 		_("Error"), msg, input);
 }
 
+gcc_const
+static bool
+is_word_char(char ch)
+{
+	return g_ascii_isalnum(ch) || ch == '-' || ch == '_';
+}
+
+static char *
+after_unquoted_word(char *p)
+{
+	if (!is_word_char(*p)) {
+		print_error(_("Word expected"), p);
+		return NULL;
+	}
+
+	++p;
+
+	while (is_word_char(*p))
+		++p;
+
+	return p;
+}
+
 static int
 parse_key_value(char *str, char **end)
 {
@@ -390,25 +413,25 @@ get_search_mode(char *value)
 static bool
 parse_line(char *line)
 {
-	size_t len = strlen(line), i = 0, j = 0;
-
 	/* get the name part */
-	char name[MAX_LINE_LENGTH];
-	while (i < len && line[i] != '=' && !g_ascii_isspace(line[i]))
-		name[j++] = line[i++];
+	char *const name = line;
+	char *const name_end = after_unquoted_word(line);
+	if (name_end == NULL)
+		return false;
 
-	name[j] = '\0';
+	line = skip_spaces(name_end);
+	if (*line == '=') {
+		++line;
+		line = skip_spaces(line);
+	} else if (line == name_end) {
+		print_error(_("'=' expected"), name_end);
+		return false;
+	}
 
-	/* skip '=' and whitespace */
-	while (i < len && (line[i] == '=' || g_ascii_isspace(line[i])))
-		i++;
+	*name_end = 0;
 
 	/* get the value part */
-	char value[MAX_LINE_LENGTH];
-	j = 0;
-	while (i < len)
-		value[j++] = line[i++];
-	value[j] = '\0';
+	char *const value = line;
 
 	/* key definition */
 	if (!strcasecmp(CONF_KEY_DEFINITION, name))