瀏覽代碼

[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>
tags/v1.20.1
Piotr Jaroszyński 15 年之前
父節點
當前提交
61206c245d
共有 1 個檔案被更改,包括 4 行新增2 行删除
  1. 4
    2
      src/core/cwuri.c

+ 4
- 2
src/core/cwuri.c 查看文件

38
  * @v uri		New working URI, or NULL
38
  * @v uri		New working URI, or NULL
39
  */
39
  */
40
 void churi ( struct uri *uri ) {
40
 void churi ( struct uri *uri ) {
41
-	struct uri *new_uri;
41
+	struct uri *new_uri = NULL;
42
+
43
+	if ( uri )
44
+		new_uri = resolve_uri ( cwuri, uri );
42
 
45
 
43
-	new_uri = resolve_uri ( cwuri, uri );
44
 	uri_put ( cwuri );
46
 	uri_put ( cwuri );
45
 	cwuri = new_uri;
47
 	cwuri = new_uri;
46
 }
48
 }

Loading…
取消
儲存