diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2012-04-10 12:26:27 +0000 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2012-04-10 12:26:27 +0000 |
| commit | cb08b8eb7ef84d17d31e6d1ebb9974c07d0d2c41 (patch) | |
| tree | 6c0d5d79adc0da0074a41a5d69217afe5f9d658a /lib | |
| parent | 6e826bb6a4337f4b94749d1a40cdc00b1c477b68 (diff) | |
| download | lvm2-cb08b8eb7ef84d17d31e6d1ebb9974c07d0d2c41.tar.gz lvm2-cb08b8eb7ef84d17d31e6d1ebb9974c07d0d2c41.tar.xz lvm2-cb08b8eb7ef84d17d31e6d1ebb9974c07d0d2c41.zip | |
Check if info struct returned is not NULL.
Just some missing checks revealed by Coverity in recent code.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cache/lvmetad.c | 5 | ||||
| -rw-r--r-- | lib/format_text/format-text.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index 356b78f2..f2bb8ebc 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -138,8 +138,9 @@ static struct lvmcache_info *_pv_populate_lvmcache( if (!vgname) vgname = fmt->orphan_vg_name; - info = lvmcache_add(fmt->labeller, (const char *)&pvid, device, - vgname, (const char *)&vgid, 0); + if (!(info = lvmcache_add(fmt->labeller, (const char *)&pvid, device, + vgname, (const char *)&vgid, 0))) + return_NULL; lvmcache_get_label(info)->sector = label_sector; lvmcache_set_device_size(info, devsize); diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index ef28539a..abd02c8e 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -1455,6 +1455,9 @@ static int _text_pv_read(const struct format_type *fmt, const char *pv_name, info = label->info; } + if (!info) + return_0; + if (!lvmcache_populate_pv_fields(info, pv, scan_label_only)) return 0; |