===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- src/usr.bin/tmux/format.c	2015/10/25 22:29:17	1.87
+++ src/usr.bin/tmux/format.c	2015/10/27 09:18:06	1.88
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.87 2015/10/25 22:29:17 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.88 2015/10/27 09:18:06 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -643,6 +643,8 @@
 	return (NULL);
 
 found:
+	if (found == NULL)
+		return (NULL);
 	copy = xstrdup(found);
 	if (modifiers & FORMAT_BASENAME) {
 		saved = copy;