From de6a293159a70493bf893dd49fa30cbf14ab7632 Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Sun, 14 Jan 2018 03:15:49 -0800
Subject: 42136: empty string check in %~ / %C prompt expansions

---
 ChangeLog    | 2 ++
 Src/prompt.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8aae9e7a8..ae241d103 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2018-01-14  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* 42136: Src/prompt.c: empty string check in %~ / %C expansions
+
 	* 42043: Src/exec.c: ZSH_DEBUG_CMD should not WARN_CREATE_GLOBAL
 
 2018-01-13  Barton E. Schaefer  <schaefer@zsh.org>
diff --git a/Src/prompt.c b/Src/prompt.c
index c478e69fb..63e8093f3 100644
--- a/Src/prompt.c
+++ b/Src/prompt.c
@@ -315,7 +315,7 @@ putpromptchar(int doprint, int endchar, unsigned int *txtchangep)
 		case '/':
 		case 'C':
 		    /* `/' gives 0, `/any' gives 1, etc. */
-		    if (*ss++ == '/' && *ss)
+		    if (*ss && *ss++ == '/' && *ss)
 			arg--;
 		    for (; *ss; ss++)
 			if (*ss == '/')
-- 
cgit 1.4.1