[syslinux:master] efi/main: set/ check for NULL in efi_create_binding()

syslinux-bot for Patrick Masotta masottaus at yahoo.com
Sun Aug 9 10:57:08 PDT 2015


Commit-ID:  e466d2498604c8eea055a8e98284d65311073b39
Gitweb:     http://www.syslinux.org/commit/e466d2498604c8eea055a8e98284d65311073b39
Author:     Patrick Masotta <masottaus at yahoo.com>
AuthorDate: Sat, 1 Aug 2015 07:40:16 -0400
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Sat, 1 Aug 2015 07:40:34 -0400

efi/main: set/check for NULL in efi_create_binding()

If LibLocateHandle() returns success and either 0 handles or we find no
matching handles, treat it the same.

Originally-By: Patrick Masotta <masottaus at yahoo.com>
Signed-off-by: Gene Cumm <gene.cumm at gmail.com>

---
 efi/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/efi/main.c b/efi/main.c
index 4a3be4c..6dbc259 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -81,7 +81,7 @@ bool efi_get_MAC( EFI_DEVICE_PATH * pDevPath, uint8_t * mac, uint16_t mac_size)
 /* As of UEFI-2.4.0, all EFI_SERVICE_BINDINGs are for networking */
 struct efi_binding *efi_create_binding(EFI_GUID *bguid, EFI_GUID *pguid)
 {
-    EFI_SERVICE_BINDING *sbp;
+    EFI_SERVICE_BINDING *sbp = NULL;
     struct efi_binding *b;
     EFI_STATUS status;
     EFI_HANDLE sb_handle, protocol, child;
@@ -126,7 +126,7 @@ struct efi_binding *efi_create_binding(EFI_GUID *bguid, EFI_GUID *pguid)
 
 	}
     }
-    if (status != EFI_SUCCESS)
+    if (status != EFI_SUCCESS || sbp == NULL)
 	goto free_binding;
 
     child = NULL;


More information about the Syslinux-commits mailing list