From e6683f20e5c38d3e5447f45845d04ddda75d0f23 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Fri, 9 Oct 2026 17:14:43 +0000
Subject: [PATCH] 'main': Prevent an infinite loop when $PWD had been deleted

Fixes #819
---
 highlighters/main/main-highlighter.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 061e2a4..8531e58 100644
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -1240,9 +1240,14 @@ _zsh_highlight_main_highlighter_check_path()
   fi
   tmp_path=$tmp_path:a
 
+  local candidate_new_tmp_path
   while [[ $tmp_path != / ]]; do
     [[ -n ${(M)ZSH_HIGHLIGHT_DIRS_BLACKLIST:#$tmp_path} ]] && return 1
-    tmp_path=$tmp_path:h
+    candidate_new_tmp_path=${tmp_path:h}
+    if [[ $candidate_new_tmp_path == $tmp_path ]]; then
+      break
+    fi
+    tmp_path=${candidate_new_tmp_path}
   done
 
   if (( in_command_position )); then