Merge branch 'master' into next

extras/conf/SRB2-22.cfg

@@ -690,9 +690,9 @@ linedeftypes
 			title = "Chain Parameters";
 			prefix = "(9)";
 			flags32text = "[5] Swing instead of spin";
+			flags128text = "[7] Make chain from end item";
 			flags64text = "[6] Player-turnable chain";
-			flags128text = "[7] Make chain from maces";
-			flags256text = "[8] Spawn mace at origin";
+			flags256text = "[8] Spawn link at origin";
 			flags512text = "[9] Don't clip inside ground";
 			flags1024text = "[10] No distance check";
 		}

src/m_misc.c

@@ -2474,6 +2474,8 @@ int M_PathParts(const char *path)
 	int n;
 	const char *p;
 	const char *t;
+	if (path == NULL)
+		return 0;
 	for (n = 0, p = path ;; ++n)
 	{
 		t = p;