|
 |
78e1a10 |
From c7bb1be13a759a55216c99662d660614a161c37f Mon Sep 17 00:00:00 2001
|
|
|
6f1e3d5 |
From: Peter Jones <pjones@redhat.com>
|
|
|
6f1e3d5 |
Date: Mon, 26 Jun 2017 12:42:57 -0400
|
|
|
78e1a10 |
Subject: [PATCH 186/216] Don't use dynamic sized arrays since we don't build
|
|
|
6f1e3d5 |
with -std=c99
|
|
|
6f1e3d5 |
|
|
|
6f1e3d5 |
---
|
|
|
6f1e3d5 |
grub-core/net/net.c | 17 ++++++++++++++---
|
|
|
6f1e3d5 |
1 file changed, 14 insertions(+), 3 deletions(-)
|
|
|
6f1e3d5 |
|
|
|
6f1e3d5 |
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
|
|
|
ec4acbb |
index 4be228d9576..fa3e2912643 100644
|
|
|
6f1e3d5 |
--- a/grub-core/net/net.c
|
|
|
6f1e3d5 |
+++ b/grub-core/net/net.c
|
|
|
6f1e3d5 |
@@ -1853,14 +1853,25 @@ grub_net_search_configfile (char *config)
|
|
|
6f1e3d5 |
{
|
|
|
6f1e3d5 |
/* By the Client UUID. */
|
|
|
6f1e3d5 |
|
|
|
6f1e3d5 |
- char client_uuid_var[sizeof ("net_") + grub_strlen (inf->name) +
|
|
|
6f1e3d5 |
- sizeof ("_clientuuid") + 1];
|
|
|
6f1e3d5 |
- grub_snprintf (client_uuid_var, sizeof (client_uuid_var),
|
|
|
6f1e3d5 |
+ char *client_uuid_var;
|
|
|
6f1e3d5 |
+ grub_size_t client_uuid_var_size;
|
|
|
6f1e3d5 |
+
|
|
|
6f1e3d5 |
+ client_uuid_var_size = grub_snprintf (NULL, 0,
|
|
|
6f1e3d5 |
+ "net_%s_clientuuid", inf->name);
|
|
|
6f1e3d5 |
+ if (client_uuid_var_size <= 0)
|
|
|
6f1e3d5 |
+ continue;
|
|
|
6f1e3d5 |
+ client_uuid_var_size += 1;
|
|
|
6f1e3d5 |
+ client_uuid_var = grub_malloc(client_uuid_var_size);
|
|
|
6f1e3d5 |
+ if (!client_uuid_var)
|
|
|
6f1e3d5 |
+ continue;
|
|
|
6f1e3d5 |
+ grub_snprintf (client_uuid_var, client_uuid_var_size,
|
|
|
6f1e3d5 |
"net_%s_clientuuid", inf->name);
|
|
|
6f1e3d5 |
|
|
|
6f1e3d5 |
const char *client_uuid;
|
|
|
6f1e3d5 |
client_uuid = grub_env_get (client_uuid_var);
|
|
|
6f1e3d5 |
|
|
|
6f1e3d5 |
+ grub_free(client_uuid_var);
|
|
|
6f1e3d5 |
+
|
|
|
6f1e3d5 |
if (client_uuid)
|
|
|
6f1e3d5 |
{
|
|
|
6f1e3d5 |
grub_strcpy (suffix, client_uuid);
|
|
|
6f1e3d5 |
--
|
|
|
ec4acbb |
2.15.0
|
|
|
6f1e3d5 |
|