100e37f2e6
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/grub2#f7e054f3d693af43a903faf33b70673f7aca4508
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 20 Jul 2020 12:24:02 -0400
|
|
Subject: [PATCH] Fix const char ** pointers in grub-core/net/url.c
|
|
|
|
This will need to get folded back in the right place on the next rebase,
|
|
but it's before "Make grub_strtol() "end" pointers have safer const
|
|
qualifiers" currently, so for now I'm leaving it here instead of merging
|
|
it back with the original patch.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/net/url.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/net/url.c b/grub-core/net/url.c
|
|
index 146858284cd..d9d2fc9a9dc 100644
|
|
--- a/grub-core/net/url.c
|
|
+++ b/grub-core/net/url.c
|
|
@@ -235,7 +235,7 @@ extract_http_url_info (char *url, int ssl,
|
|
c = *port_end;
|
|
*port_end = '\0';
|
|
|
|
- portul = grub_strtoul (port_off, &separator, 10);
|
|
+ portul = grub_strtoul (port_off, (const char **)&separator, 10);
|
|
*port_end = c;
|
|
#ifdef URL_TEST
|
|
if (portul == ULONG_MAX && errno == ERANGE)
|