Index: trunk/utils/mount/version.h
===================================================================
--- trunk.orig/utils/mount/version.h
+++ trunk/utils/mount/version.h
@@ -37,14 +37,23 @@
 static inline unsigned int linux_version_code(void)
 {
 	struct utsname my_utsname;
-	unsigned int p, q, r;
+	unsigned int p = 0, q = 0, r = 0;
+	char *t;
 
 	if (uname(&my_utsname))
 		return 0;
 
-	p = (unsigned int)atoi(strtok(my_utsname.release, "."));
-	q = (unsigned int)atoi(strtok(NULL, "."));
-	r = (unsigned int)atoi(strtok(NULL, "."));
+	t = strtok(my_utsname.release, ".");
+	if (t) {
+		p = (unsigned int)atoi(t);
+		t = strtok(NULL, ".");
+		if (t) {
+			q = (unsigned int)atoi(t);
+			t = strtok(NULL, ".");
+			if (t)
+				r = (unsigned int)atoi(t);
+		}
+	}
 	return MAKE_VERSION(p, q, r);
 }
 
