diff options
| author | Dennis Friis <peavey@placid.dk> | 2008-04-16 11:50:12 +0000 |
|---|---|---|
| committer | Dennis Friis <peavey@placid.dk> | 2008-04-16 11:50:12 +0000 |
| commit | 4e0253cfd7c6a7684341f55f4a1f3dd88eeb5609 (patch) | |
| tree | 2639c9414e48adf59348b0007bd165ce9b0f17cb | |
| parent | f2753bb01b8c1e1c5b487dcf08032e4e4f16c9a1 (diff) | |
| download | mana-4e0253cfd7c6a7684341f55f4a1f3dd88eeb5609.tar.gz mana-4e0253cfd7c6a7684341f55f4a1f3dd88eeb5609.tar.bz2 mana-4e0253cfd7c6a7684341f55f4a1f3dd88eeb5609.tar.xz mana-4e0253cfd7c6a7684341f55f4a1f3dd88eeb5609.zip | |
Also fix potential out of range in BrowserBox::draw when checking for color codes.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/gui/browserbox.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -1,7 +1,8 @@ 2008-04-16 Dennis Friis <peavey@placid.dk> * src/gui/browserbox.cpp: Fix a basic_string::at sometimes being out - of range in BrowserBox::draw when checking for line separators. + of range in BrowserBox::draw when checking for line separators and + color codes. 2008-04-16 Bjørn Lindeijer <bjorn@lindeijer.nl> diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index a2613389..f6c9c51c 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -314,7 +314,8 @@ BrowserBox::draw(gcn::Graphics *graphics) for (j = 0; j < row.size(); j++) { - if (mUseLinksAndUserColors || (!mUseLinksAndUserColors && (j == 0))) + if ( (mUseLinksAndUserColors && (j + 3) <= row.size()) || + (!mUseLinksAndUserColors && (j == 0)) ) { // Check for color change in format "##x", x = [L,P,0..9] if ((row.at(j) == '#') && (row.at(j + 1) == '#')) |