You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.1 KiB
42 lines
1.1 KiB
From 5a964a7f388dd0ecf865fc0fde802b561aab2fb6 Mon Sep 17 00:00:00 2001 |
|
From: Peter Jones <pjones@redhat.com> |
|
Date: Sun, 19 Jul 2020 17:14:15 -0400 |
|
Subject: [PATCH 328/336] efi+http: fix some allocation error checking. |
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com> |
|
--- |
|
grub-core/net/efi/http.c | 11 +++++++---- |
|
1 file changed, 7 insertions(+), 4 deletions(-) |
|
|
|
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c |
|
index fc8cb25ae0a..26647a50fa4 100644 |
|
--- a/grub-core/net/efi/http.c |
|
+++ b/grub-core/net/efi/http.c |
|
@@ -412,8 +412,8 @@ grub_efihttp_open (struct grub_efi_net_device *dev, |
|
int type) |
|
{ |
|
grub_err_t err; |
|
- grub_off_t size; |
|
- char *buf; |
|
+ grub_off_t size = 0; |
|
+ char *buf = NULL; |
|
char *file_name = NULL; |
|
const char *http_path; |
|
|
|
@@ -441,8 +441,11 @@ grub_efihttp_open (struct grub_efi_net_device *dev, |
|
return err; |
|
} |
|
|
|
- buf = grub_malloc (size); |
|
- efihttp_read (dev, buf, size); |
|
+ if (size) |
|
+ { |
|
+ buf = grub_malloc (size); |
|
+ efihttp_read (dev, buf, size); |
|
+ } |
|
|
|
file->size = size; |
|
file->data = buf; |
|
-- |
|
2.26.2 |
|
|
|
|