summaryrefslogtreecommitdiffstats
path: root/align/scan.c
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-11-24 14:06:31 +0000
committerRichard W.M. Jones <rjones@redhat.com>2011-11-24 21:06:55 +0000
commited628d30b05b4f5884f1d2029633cf155bf5e571 (patch)
tree8c70d58f5ee6e2be764d1281f7455005c94403da /align/scan.c
parentfd0dfead3088da242e1654095cbb6f37383be843 (diff)
downloadlibguestfs-ed628d30b05b4f5884f1d2029633cf155bf5e571.tar.gz
libguestfs-ed628d30b05b4f5884f1d2029633cf155bf5e571.tar.xz
libguestfs-ed628d30b05b4f5884f1d2029633cf155bf5e571.zip
virt-alignment-scan: Add checks for when API calls return NULL.
In particular, virt-alignment-scan -a /dev/null would segfault because of an error returned by parted. (cherry picked from commit 7b192f5a672197ad67ac23501e420c674aa2f3a9)
Diffstat (limited to 'align/scan.c')
-rw-r--r--align/scan.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/align/scan.c b/align/scan.c
index 529add53..7b4631ab 100644
--- a/align/scan.c
+++ b/align/scan.c
@@ -228,9 +228,13 @@ scan (void)
struct guestfs_partition_list *parts;
devices = guestfs_list_devices (g);
+ if (devices == NULL)
+ exit (EXIT_FAILURE);
for (i = 0; devices[i] != NULL; ++i) {
parts = guestfs_part_list (g, devices[i]);
+ if (parts == NULL)
+ exit (EXIT_FAILURE);
/* Canonicalize the name of the device for printing. */
if (STRPREFIX (devices[i], "/dev/") &&