From 62dbb73c69ee1faa53c4020bae003527f8afa7c1 Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Mon, 2 Mar 2009 12:13:11 +0000
Subject: Bug #2635257 Shell HERE (redirect stdin) end not detected in Bash
 Lexer fixed.

---
 src/LexBash.cxx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/LexBash.cxx b/src/LexBash.cxx
index 7b475a7de..5801278be 100644
--- a/src/LexBash.cxx
+++ b/src/LexBash.cxx
@@ -334,6 +334,10 @@ static void ColouriseBashDoc(unsigned int startPos, int length, int initStyle,
 					}
 					char s[HERE_DELIM_MAX];
 					sc.GetCurrent(s, sizeof(s));
+					if (sc.LengthCurrent() == 0)
+						break;
+					if (s[strlen(s) - 1] == '\r')
+						s[strlen(s) - 1] = '\0';
 					if (strcmp(HereDoc.Delimiter, s) == 0) {
 						if ((prefixws > 0 && HereDoc.Indent) ||	// indentation rule
 							(prefixws == 0 && !HereDoc.Indent)) {
-- 
cgit v1.2.3