aboutsummaryrefslogtreecommitdiff
path: root/src/scintilla_backports/6161_e7ca78c6f29c.patch
blob: cd8e88d45b063f871ff527ee95c98c374bd8ed06 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
# HG changeset patch
# User Neil <nyamatongwe@gmail.com>
# Date 1491209937 -36000
# Node ID e7ca78c6f29cf64c8c26e3e6ee2d63f4dbd48909
# Parent  a1a9cde519976fa12e46224d6cd57483bc4633ae
Prevent warning from MSVC Code Analysis.

diff -r a1a9cde51997 -r e7ca78c6f29c src/Decoration.cxx
--- a/src/Decoration.cxx	Sun Apr 02 08:17:38 2017 +1000
+++ b/src/Decoration.cxx	Mon Apr 03 18:58:57 2017 +1000
@@ -89,10 +89,12 @@
 			decoToDelete = root;
 			root = root->Next();
 		} else {
-			Decoration *deco=root;
-			while (deco->Next() && !decoToDelete) {
-				if (deco->Next() && deco->Next()->Indicator() == indicator) {
-					decoToDelete = deco->Next();
+			Decoration *deco = root;
+			while (deco && deco->Next() && !decoToDelete) {
+				// decoNext ensures no warning from MSVC Code Analysis
+				Decoration *decoNext = deco->Next();
+				if (decoNext && deco->Next()->Indicator() == indicator) {
+					decoToDelete = decoNext;
 					deco->next = decoToDelete->Next();
 				} else {
 					deco = deco->Next();