diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2013-04-19 17:03:50 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2013-04-21 22:56:59 +0200 |
| commit | 45f396f2a075054f4e047abdef5eafffca72a281 (patch) | |
| tree | b0dafb47b7dd49e93588451c2ee86b4a374c2fa9 /daemons | |
| parent | ba3cee36300d56efcdcb0af883141b1b0a6129a1 (diff) | |
| download | lvm2-45f396f2a075054f4e047abdef5eafffca72a281.tar.gz | |
dmeventd: check for msg.data nonnull
Ensure we will not use msg.data as NULL for strchr.
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/dmeventd/libdevmapper-event.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index 1f8fbef54..f7b586e3c 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -815,13 +815,13 @@ int dm_event_get_version(struct dm_event_fifos *fifos, int *version) { p = msg.data; *version = 0; - p = strchr(p, ' '); /* Message ID */ - if (!p) return 0; - p = strchr(p + 1, ' '); /* HELLO */ - if (!p) return 0; - p = strchr(p + 1, ' '); /* HELLO, once more */ - if (p) + if (!p || !(p = strchr(p, ' '))) /* Message ID */ + return 0; + if (!(p = strchr(p + 1, ' '))) /* HELLO */ + return 0; + if ((p = strchr(p + 1, ' '))) /* HELLO, once more */ *version = atoi(p); + return 1; } |