[Libguestfs] [PATCH] launch: direct: check for null paths in make_uri

[Richard W.M. Jones]

On Mon, Jul 28, 2014 at 07:53:21PM +0200, Pino Toscano wrote:
> Some protocols may pass a null path to make_uri, so make sure to handle
> that gracefully.
> ---
>  src/launch-direct.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/launch-direct.c b/src/launch-direct.c
> index 104809d..9654e04 100644
> --- a/src/launch-direct.c
> +++ b/src/launch-direct.c
> @@ -1218,7 +1218,7 @@ make_uri (guestfs_h *g, const char *scheme, const char *user,
>    CLEANUP_FREE char *userauth = NULL;
>  
>    /* Need to add a leading '/' to URI paths since xmlSaveUri doesn't. */
> -  if (path[0] != '/') {
> +  if (path != NULL && path[0] != '/') {
>      pathslash = safe_asprintf (g, "/%s", path);
>      uri.path = pathslash;
>    }

Slightly hard to follow the original code, but I think this is correct
so ACK, especially if it passes the test (assuming we have a test
which covers this obscure gluster+unix case ...).

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top