From ad80846283023d319d3a1c2c4d193a42c7690d1f Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Thu, 14 Jan 2010 22:39:42 +0100
Subject: [PATCH] Fix getpath() not to crash when path exceeds MAX_PATH_LEN

Trivial for players to trigger.  Broken in commit 0b0612ea, v4.3.16.
Spotted by the Clang Static Analyzer.
---
 src/lib/subs/paths.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/subs/paths.c b/src/lib/subs/paths.c
index e9754b3d..4a95ed38 100644
--- a/src/lib/subs/paths.c
+++ b/src/lib/subs/paths.c
@@ -173,7 +173,7 @@ getpath(char *buf, char *arg, coord x, coord y, int onlyown,
     if (p + strlen(bp) + 1 >= buf + MAX_PATH_LEN) {
 	pr("Path length may not exceed %d.\n", MAX_PATH_LEN);
 	pr("Aborting...\n");
-	bp = NULL;
+	return NULL;
     }
     strcpy(p, bp);
     if (*bp)