[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 f649ba440b1c6350e474cb3daa49ce80278cb5bf..893e2050b39cd71c9598e792d0cda6458a0fe392 100644 (file)
--- 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;
 }