aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBen Bluemel <ben1982@gmail.com>2011-08-05 23:54:55 +0100
committerBen Bluemel <ben1982@gmail.com>2011-08-05 23:54:55 +0100
commite67e8519a388594e98f94d5c8d5c3e7a36086d00 (patch)
tree77e143588ed665e45d57f78747296d65f4a89665
parentcec33e5615116147330dce0c6109f34db93c01b1 (diff)
downloadscintilla-mirror-e67e8519a388594e98f94d5c8d5c3e7a36086d00.tar.gz
Fix to check for other.states.empty() when Merging SparseStates.
-rw-r--r--lexlib/SparseState.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lexlib/SparseState.h b/lexlib/SparseState.h
index 655d7429c..08ff104d3 100644
--- a/lexlib/SparseState.h
+++ b/lexlib/SparseState.h
@@ -92,7 +92,7 @@ public:
changed = true;
}
typename stateVector::const_iterator startOther = other.states.begin();
- if (!states.empty() && states.back().value == startOther->value)
+ if (!states.empty() && !other.states.empty() && states.back().value == startOther->value)
++startOther;
if (startOther != other.states.end()) {
states.insert(states.end(), startOther, other.states.end());