From: Piotr Jaroszyński <p.jaroszynski@gmail.com>
Date: Mon, 12 Apr 2010 15:37:10 +0000 (+0200)
Subject: [uri] Special case NULL in churi()
X-Git-Tag: v1.20.1~2690
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61206c245de7870eeb65417ffdb1c98b8fee88e1;p=thirdparty%2Fipxe.git

[uri] Special case NULL in churi()

resolve_uri() doesn't (and probably shouldn't) handle NULL relative_uri.

Signed-off-by: Piotr Jaroszyński <p.jaroszynski@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Marty Connor <mdc@etherboot.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/core/cwuri.c b/src/core/cwuri.c
index f649ba440..893e2050b 100644
--- a/src/core/cwuri.c
+++ b/src/core/cwuri.c
@@ -38,9 +38,11 @@ struct uri *cwuri = NULL;
  * @v uri		New working URI, or NULL
  */
 void churi ( struct uri *uri ) {
-	struct uri *new_uri;
+	struct uri *new_uri = NULL;
+
+	if ( uri )
+		new_uri = resolve_uri ( cwuri, uri );
 
-	new_uri = resolve_uri ( cwuri, uri );
 	uri_put ( cwuri );
 	cwuri = new_uri;
 }