narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[uri] Fix NULL dereference in parse_uri() 

Don't try to parse authority if it's not there.

Modified-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/1/head
Piotr Jaroszyński 2010-04-12 17:15:44 +02:00 committed by Michael Brown
parent 132c391712
commit 4cb0bfe291
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/uri.c
View File

@ -74,8 +74,8 @@ struct uri * parse_uri ( const char *uri_string ) {
struct uri *uri; struct uri *uri;
char *raw; char *raw;
char *tmp; char *tmp;
char *path = NULL; char *path;
char *authority = NULL; char *authority;
int i; int i;
size_t raw_len; size_t raw_len;
@ -110,6 +110,7 @@ struct uri * parse_uri ( const char *uri_string ) {
} else { } else {
/* Absolute URI with opaque part */ /* Absolute URI with opaque part */
uri->opaque = tmp; uri->opaque = tmp;
path = NULL;
} }
} else { } else {
/* Relative URI */ /* Relative URI */
@ -148,8 +149,15 @@ struct uri * parse_uri ( const char *uri_string ) {
} else { } else {
/* Absolute/relative path */ /* Absolute/relative path */
uri->path = path; uri->path = path;
authority = NULL;
} }
/* If we don't have an authority (i.e. we have a non-net
* path), we're already finished processing
*/
if ( ! authority )
goto done;
/* Split authority into user[:password] and host[:port] portions */ /* Split authority into user[:password] and host[:port] portions */
if ( ( tmp = strchr ( authority, '@' ) ) ) { if ( ( tmp = strchr ( authority, '@' ) ) ) {
/* Has user[:password] */ /* Has user[:password] */