arrfab / rpms / shim

Forked from rpms/shim 4 years ago
Clone
Blob Blame History Raw
From c0949c0a7916e81767ab35f67005b80cfb565e2c Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Sun, 21 Sep 2014 15:19:34 -0400
Subject: [PATCH 74/74] Correctly reject bad tftp addresses earlier, rather
 than later.

This check is for end == NULL but was meant to be *end == '\0'.  Without
this change, we'll pass a plausibly bad address (i.e. one with no ']' at
the end) to Mtftp(... READ_FILE ...), which should fail correctly, but
our error messaging will be inconsistent.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 netboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netboot.c b/netboot.c
index f884cba..ad5d37e 100644
--- a/netboot.c
+++ b/netboot.c
@@ -234,7 +234,7 @@ static BOOLEAN extract_tftp_info(CHAR8 *url)
 			return FALSE;
 		}
 	}
-	if (end == '\0') {
+	if (*end == '\0') {
 		Print(L"TFTP SERVER MUST BE ENCLOSED IN [..]\n");
 		return FALSE;
 	}
-- 
1.9.3