diff options
| author | nyamatongwe <unknown> | 2011-11-17 09:37:58 +1100 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-11-17 09:37:58 +1100 |
| commit | 0ef62beae3fabdd071cd8158b2bed8891aedc66a (patch) | |
| tree | 65d74d78bcec48095300e3504d83900c1f7feb5a | |
| parent | 8eda5392b9e445f20b0f615c3aaba88b4fa175e8 (diff) | |
| download | scintilla-mirror-0ef62beae3fabdd071cd8158b2bed8891aedc66a.tar.gz | |
Fix crash caused by out-of-bounds memory access for line:
#if defined( XXX 1
From Stefan Weil.
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | lexers/LexCPP.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 2f70d81a3..c7ef3e593 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -387,6 +387,7 @@ <td>Chris Angelico</td> </tr><tr> <td>Marat Dukhan</td> + <td>Stefan Weil</td> </tr> </table> <p> diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 1ad3a7081..1b56519c2 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -1050,7 +1050,7 @@ void LexerCPP::EvaluateTokens(std::vector<std::string> &tokens) { if (tokens[i+2] == ")") { // defined() tokens.erase(tokens.begin() + i + 1, tokens.begin() + i + 3); - } else if (((i+2)<tokens.size()) && (tokens[i+3] == ")")) { + } else if (((i+3)<tokens.size()) && (tokens[i+3] == ")")) { // defined(<int>) tokens.erase(tokens.begin() + i + 1, tokens.begin() + i + 4); val = "1"; |