From 55782f91e21dc8b9d296f13f0562670095042d1f Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 1 Oct 2013 12:42:57 +0800 Subject: [PATCH] discover/grub2: strdup strings used in the environment Use a copy of the name & value pairs that we pass to the environment, as the data loaded from load_env will be talloc_free-ed. Signed-off-by: Jeremy Kerr --- discover/grub2/script.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/discover/grub2/script.c b/discover/grub2/script.c index 75b8aaa..2aaf1d3 100644 --- a/discover/grub2/script.c +++ b/discover/grub2/script.c @@ -23,8 +23,8 @@ container_of(stmt, struct grub2_statement_conditional, st) struct env_entry { - const char *name; - const char *value; + char *name; + char *value; struct list_item list; }; @@ -75,11 +75,13 @@ void script_env_set(struct grub2_script *script, if (!entry) { entry = talloc(script, struct env_entry); - entry->name = name; + entry->name = talloc_strdup(entry, name); list_add(&script->environment, &entry->list); + } else { + talloc_free(entry->value); } - entry->value = value; + entry->value = talloc_strdup(entry, value); } static bool expand_var(struct grub2_script *script, struct grub2_word *word) -- 2.39.2