search for: 533e9fb4b

Fix for: https://bugzilla.redhat.com/show_bug.cgi?id=1409024

This function returns -1 if things like fork(2) fail, so it is right to return an error here. If the PBMTEXT command fails then that's a NOT_FOUND case. --- lib/inspect-icon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c index 533e9fb4b..0edd3d1b0 100644 --- a/lib/inspect-icon.c +++ b/lib/inspect-icon.c @@ -400,7 +400,7 @@ icon_cirros (guestfs_h *g, size_t *size_r) guestfs_int_cmd_add_string_quoted (cmd, pngfile); r = guestfs_int_cmd_run (cmd); if (r == -1) - return NOT_FOUND; + return NULL; if (!WIFEXITED (r)...

...e = guestfs_int_make_temp_path (g, "scratch", "img"); + if (!filename) + return -1; /* Create a raw format temporary disk. */ if (guestfs_disk_create (g, filename, "raw", size, -1) == -1) diff --git a/lib/inspect-icon.c b/lib/inspect-icon.c index 3e44b23eb..533e9fb4b 100644 --- a/lib/inspect-icon.c +++ b/lib/inspect-icon.c @@ -390,7 +390,9 @@ icon_cirros (guestfs_h *g, size_t *size_r) return NOT_FOUND; /* Use pbmtext to render it. */ - pngfile = safe_asprintf (g, "%s/cirros.png", g->tmpdir); + pngfile = guestfs_int_make_temp_path (g, &q...

v1 -> v2: - Remove the unnecessary calls to guestfs_int_lazy_make_tmpdir in the final patch. Rich.

Miscellaneous small cleanups in lib/ directory. Rich.