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

all: try to protect access to journal_strs and sign_locs against bad index...

Browse Source
This commit is contained in:
ALONSO Laurent
2021-10-22 15:22:57 +02:00
committed by Celtic Minstrel
parent a51ba34650
commit 47fd08904f
10 changed files with 92 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/scenedit/scen.actions.cpp
View File

@@ -527,11 +527,11 @@ static bool handle_rb_action(location the_point, bool option_hit) {
scenario.journal_strs.pop_back();
else if(j == size_before)
scenario.journal_strs.resize(size_before + 8, "*");
else scenario.journal_strs[j] = "*";
else scenario.get_journal_string(j) = "*";
} else {
if(j == size_before)
scenario.journal_strs.emplace_back("*");
if(!edit_text_str(j,STRS_JOURNAL) && j == size_before && scenario.journal_strs[j] == "*")
if(!edit_text_str(j,STRS_JOURNAL) && j == size_before && scenario.get_journal_string(j) == "*")
scenario.journal_strs.pop_back();
}
start_string_editing(STRS_JOURNAL,size_before == scenario.journal_strs.size());
@@ -567,11 +567,11 @@ static bool handle_rb_action(location the_point, bool option_hit) {
current_terrain->sign_locs.pop_back();
else if(j == size_before)
break;
else current_terrain->sign_locs[j] = {-1, -1, "*"};
else current_terrain->get_sign_loc(j) = {-1, -1, "*"};
} else {
if(j == size_before)
current_terrain->sign_locs.emplace_back(-1,-1,"*");
if(!edit_text_str(j,STRS_OUT_SIGN) && j == size_before && current_terrain->sign_locs[j].text == "*")
if(!edit_text_str(j,STRS_OUT_SIGN) && j == size_before && current_terrain->get_sign_loc(j).text == "*")
current_terrain->sign_locs.pop_back();
}
start_string_editing(STRS_OUT_SIGN,size_before == current_terrain->sign_locs.size());
@@ -586,11 +586,11 @@ static bool handle_rb_action(location the_point, bool option_hit) {
town->sign_locs.pop_back();
else if(j == size_before)
break;
else town->sign_locs[j] = {-1, -1, "*"};
else town->get_sign_loc(j) = {-1, -1, "*"};
} else {
if(j == size_before)
town->sign_locs.emplace_back(-1,-1,"*");
if(!edit_text_str(j,STRS_TOWN_SIGN) && j == size_before && town->sign_locs[j].text == "*")
if(!edit_text_str(j,STRS_TOWN_SIGN) && j == size_before && town->get_sign_loc(j).text == "*")
town->sign_locs.pop_back();
}
start_string_editing(STRS_TOWN_SIGN,size_before == town->sign_locs.size());
@@ -2559,15 +2559,15 @@ void start_string_editing(eStrMode mode,short just_redo_text) {
set_rb(i,RB_TOWN_STR, i,str.str());
break;
case 3:
str << i << " - " << scenario.journal_strs[i].substr(0,30);
str << i << " - " << scenario.get_journal_string(i).substr(0,30);
set_rb(i,RB_JOURNAL, i,str.str());
break;
case 4:
str << i << " - " << current_terrain->sign_locs[i].text.substr(0,30);
str << i << " - " << current_terrain->get_sign_loc(i).text.substr(0,30);
set_rb(i,RB_OUT_SIGN, i,str.str());
break;
case 5:
str << i << " - " << town->sign_locs[i].text.substr(0,30);
str << i << " - " << town->get_sign_loc(i).text.substr(0,30);
set_rb(i,RB_TOWN_SIGN, i,str.str());
break;
case 6:

14
src/scenedit/scen.keydlgs.cpp
View File

@@ -71,9 +71,9 @@ static std::string& fetch_str(eStrMode str_mode, size_t which) {
case 0: return scenario.get_special_string(which);
case 1: return current_terrain->get_special_string(which);
case 2: return town->get_special_string(which);
case 3: return scenario.journal_strs[which];
case 4: return current_terrain->sign_locs[which].text;
case 5: return town->sign_locs[which].text;
case 3: return scenario.get_journal_string(which);
case 4: return current_terrain->get_sign_loc(which).text;
case 5: return town->get_sign_loc(which).text;
case 6: return current_terrain->area_desc[which].descr;
case 7: return town->area_desc[which].descr;
}
@@ -88,12 +88,12 @@ static std::string str_info(eStrMode str_mode, size_t which) {
sout << which;
break;
case 4:
sout << "(" << current_terrain->sign_locs[which].x;
sout << ", " << current_terrain->sign_locs[which].y << ")";
sout << "(" << current_terrain->get_sign_loc(which).x;
sout << ", " << current_terrain->get_sign_loc(which).y << ")";
break;
case 5:
sout << "(" << town->sign_locs[which].x;
sout << ", " << town->sign_locs[which].y << ")";
sout << "(" << town->get_sign_loc(which).x;
sout << ", " << town->get_sign_loc(which).y << ")";
break;
case 6:
sout << "(" << current_terrain->area_desc[which].left;