From c12f6bacbd96fda27252bdb79781e5743c01da60 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Fri, 13 Sep 2013 15:25:33 +0800 Subject: [PATCH] discover/grub2: Fix word append The parser was setting word->next on the top-level word, resulting in word chains of a maximum length of 2. Instead, use a last pointer to always append to the last word. Signed-off-by: Jeremy Kerr --- discover/grub2/grub2.h | 1 + discover/grub2/parser-api.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h index cbd69dc..970c500 100644 --- a/discover/grub2/grub2.h +++ b/discover/grub2/grub2.h @@ -19,6 +19,7 @@ struct grub2_word { } var; }; struct grub2_word *next; + struct grub2_word *last; struct list_item argv_list; }; diff --git a/discover/grub2/parser-api.c b/discover/grub2/parser-api.c index 765bd87..f8915a1 100644 --- a/discover/grub2/parser-api.c +++ b/discover/grub2/parser-api.c @@ -75,6 +75,7 @@ struct grub2_word *create_word_text(struct grub2_parser *parser, word->type = GRUB2_WORD_TEXT; word->text = talloc_strdup(word, text); word->next = NULL; + word->last = word; return word; } @@ -86,6 +87,7 @@ struct grub2_word *create_word_var(struct grub2_parser *parser, word->var.name = talloc_strdup(word, name); word->var.split = split; word->next = NULL; + word->last = word; return word; } @@ -103,5 +105,6 @@ void argv_append(struct grub2_argv *argv, struct grub2_word *word) void word_append(struct grub2_word *w1, struct grub2_word *w2) { - w1->next = w2; + w1->last->next = w2; + w1->last = w2; } -- 2.39.2