--- make-fs/make-fs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/make-fs/make-fs.c b/make-fs/make-fs.c index 9c11fef..406aa1d 100644 --- a/make-fs/make-fs.c +++ b/make-fs/make-fs.c @@ -382,15 +382,18 @@ estimate_input (const char *input, uint64_t *estimate_rtn, char **ifmt_rtn) char line[256]; size_t len; CLEANUP_FREE char *tmpdir = guestfs_get_tmpdir (g); + int fd; if (asprintf (&tmpfile, "%s/makefsXXXXXX", tmpdir) == -1) { perror ("asprintf"); return -1; } - if (mkstemp (tmpfile) == -1) { + fd = mkstemp (tmpfile); + if (fd == -1) { perror (tmpfile); return -1; } + close (fd); if (stat (input, &statbuf) == -1) { perror (input);

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; }