gfs2-utils: master - don't dereference NULL for a hostdata string with no "="

gfs2-utils: master - don't dereference NULL for a hostdata string with no "="

[Jim Meyering]

Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=c1309888b4824577cc334f3fcdb2b9bbcbe4a84b
Commit:        c1309888b4824577cc334f3fcdb2b9bbcbe4a84b
Parent:        bf290707a90710422feeef90124459fdc39e783f
Author:        Jim Meyering <meyering@redhat.com>
AuthorDate:    Mon Jun 29 17:58:16 2009 +0200
Committer:     Jim Meyering <meyering@redhat.com>
CommitterDate: Thu Jul 2 12:52:56 2009 +0200

don't dereference NULL for a hostdata string with no "="

* gfs2/mount/util.c (lock_dlm_join): Instead, just ignore it.
---
 gfs2/mount/util.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gfs2/mount/util.c b/gfs2/mount/util.c
index 16f8985..cb1a860 100644
--- a/gfs2/mount/util.c
+++ b/gfs2/mount/util.c
@@ -503,9 +503,11 @@ int lock_dlm_join(struct mount_options *mo, struct gen_sb *sb)
 	if (!mo->hostdata[0])
 		snprintf(mo->hostdata, PATH_MAX, "%s", ma.hostdata);
 	else {
-		char *p = strstr(ma.hostdata, "=") + 1;
-		strcat(mo->hostdata, ":");
-		strcat(mo->hostdata, p);
+		const char *p = strstr(ma.hostdata, "=");
+		if (p) {
+			strcat(mo->hostdata, ":");
+			strcat(mo->hostdata, p + 1);
+		}
 	}
 
 	log_debug("lock_dlm_join: hostdata: \"%s\"", mo->hostdata);