Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxStyledTextCtrl::GetTextRangeRaw() for invalid positions

Browse Source 
Don't return garbage if the input positions are out of range, just return an
empty string in this case.
This commit is contained in:
Paul Kulchenko
2016-05-23 21:37:21 -07:00
committed by Vadim Zeitlin
parent e9a836c9dc
commit e6a6748eaf
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/stc/stc.cpp
View File

@@ -5038,6 +5038,7 @@ wxCharBuffer wxStyledTextCtrl::GetTextRangeRaw(int startPos, int endPos)
tr.lpstrText = buf.data(); tr.lpstrText = buf.data();
tr.chrg.cpMin = startPos; tr.chrg.cpMin = startPos;
tr.chrg.cpMax = endPos; tr.chrg.cpMax = endPos;
tr.lpstrText[0] = '\0'; // initialize with 0 in case the range is invalid
SendMsg(SCI_GETTEXTRANGE, 0, (sptr_t)&tr); SendMsg(SCI_GETTEXTRANGE, 0, (sptr_t)&tr);
return buf; return buf;
} }

1
src/stc/stc.cpp.in
View File

@@ -744,6 +744,7 @@ wxCharBuffer wxStyledTextCtrl::GetTextRangeRaw(int startPos, int endPos)
tr.lpstrText = buf.data(); tr.lpstrText = buf.data();
tr.chrg.cpMin = startPos; tr.chrg.cpMin = startPos;
tr.chrg.cpMax = endPos; tr.chrg.cpMax = endPos;
tr.lpstrText[0] = '\0'; // initialize with 0 in case the range is invalid
SendMsg(SCI_GETTEXTRANGE, 0, (sptr_t)&tr); SendMsg(SCI_GETTEXTRANGE, 0, (sptr_t)&tr);
return buf; return buf;
} }