From d27146d6d80ed619f2d0c6eb883ec7c7b51479c7 Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Wed, 24 Sep 2003 21:57:20 +0000
Subject: Fixed read past end of allocation in drawing indicators.

---
 src/Editor.cxx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Editor.cxx b/src/Editor.cxx
index 95ac7a8b6..c764344b7 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -2300,14 +2300,16 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis
 		indStart[indica] = 0;
 
 	for (int indicPos = lineStart; indicPos <= lineEnd; indicPos++) {
-		if ((ll->indicators[indicPos] != ll->indicators[indicPos + 1]) || (indicPos == lineEnd)) {
+		if ((indicPos == lineEnd) || (ll->indicators[indicPos] != ll->indicators[indicPos + 1])) {
 			int mask = 1 << pdoc->stylingBits;
 			for (int indicnum = 0; mask < 0x100; indicnum++) {
-				if ((ll->indicators[indicPos + 1] & mask) && !(ll->indicators[indicPos] & mask)) {
+				if ((indicPos == lineEnd)) {
+					indStart[indicnum] = ll->positions[indicPos];
+				} else if ((ll->indicators[indicPos + 1] & mask) && !(ll->indicators[indicPos] & mask)) {
 					indStart[indicnum] = ll->positions[indicPos + 1];
 				}
-				if ((ll->indicators[indicPos] & mask) && (
-					!(ll->indicators[indicPos + 1] & mask) || (indicPos == lineEnd))) {
+				if ((ll->indicators[indicPos] & mask) && 
+					((indicPos == lineEnd) || !(ll->indicators[indicPos + 1] & mask))) {
 					int endIndicator = indicPos;
 					if (endIndicator >= lineEnd)
 						endIndicator = lineEnd-1;
-- 
cgit v1.2.3