openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix buffer overreach in duplicate string detection

Browse Source 
Thanks to @fosnola for the fix.
This commit is contained in:
Celtic Minstrel
2023-01-18 14:20:29 -05:00
parent 6b56f4af86
commit 298e61e2f8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/boe.text.cpp
View File

@@ -979,9 +979,10 @@ void add_string_to_buf(std::string str, unsigned short indent) {
int prev_pointer = buf_pointer - 1; int prev_pointer = buf_pointer - 1;
if(prev_pointer < 0) prev_pointer = TEXT_BUF_LEN - 1; if(prev_pointer < 0) prev_pointer = TEXT_BUF_LEN - 1;
size_t last = 0, new_last = str.find_last_not_of(' '); size_t last = 0, new_last = str.find_last_not_of(' ');
// Find the last non-space character that matches
while(last < str.length() && str[last] == text_buffer[prev_pointer].line[last]) while(last < str.length() && str[last] == text_buffer[prev_pointer].line[last])
last++; last++;
while(text_buffer[prev_pointer].line[--last] == ' '); while(last > 0 && text_buffer[prev_pointer].line[--last] == ' ');
bool is_dup = false; bool is_dup = false;
if(last == new_last) { if(last == new_last) {
size_t num_pos = 0; size_t num_pos = 0;