[syslinux:master] menu hiddenkey: fix parsing the config file option

syslinux-bot for H. Peter Anvin hpa at linux.intel.com
Mon Apr 18 13:54:18 PDT 2011


Commit-ID:  67603c535d96bcd611d06b2844fcd3d33da90f22
Gitweb:     http://syslinux.zytor.com/commit/67603c535d96bcd611d06b2844fcd3d33da90f22
Author:     H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Mon, 11 Apr 2011 15:22:17 -0700
Committer:  H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Mon, 11 Apr 2011 15:22:17 -0700

menu hiddenkey: fix parsing the config file option

Fix parsing bugs in the config file.

Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>


---
 com32/menu/readconfig.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
index 1d02120..fdf2e27 100644
--- a/com32/menu/readconfig.c
+++ b/com32/menu/readconfig.c
@@ -151,7 +151,7 @@ static char *get_word(char *str, const char **word)
     while (*p && !my_isspace(*p))
 	p++;
 
-    *word = q = refstr_alloc(p - str + 1);
+    *word = q = refstr_alloc(p - str);
     memcpy(q, str, p - str);
     /* refstr_alloc() already inserted a terminating NUL */
 
@@ -723,8 +723,7 @@ static void parse_config_file(FILE * f)
 	    } else if (looking_at(p, "hiddenkey")) {
 		const char *key_name;
 		int key;
-		p = skipspace(p + 7);
-		p = get_word(p, &key_name);
+		p = get_word(skipspace(p + 9), &key_name);
 		p = skipspace(p);
 		key = key_name_to_code(key_name);
 		refstr_put(key_name);



More information about the Syslinux-commits mailing list