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

Asan: correct some undefined, ... problems

Browse Source
This commit is contained in:
Laurent Alonso(fr)
2020-05-16 15:15:38 +02:00
committed by Celtic Minstrel
parent b6c5552ac0
commit 9f802b3fcf
8 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/game/boe.infodlg.cpp
View File

@@ -701,15 +701,25 @@ void cStringRecorder::operator()(cDialog& me) {
switch(type) {
case NOTE_SCEN:
str1 = univ.scenario.spec_strs[label1];
str2 = univ.scenario.spec_strs[label2];
if (label2>=univ.scenario.spec_strs.size())
showError("cStringRecorder(): bad label 2.");
else
str2 = univ.scenario.spec_strs[label2];
break;
case NOTE_TOWN:
str1 = univ.town->spec_strs[label1];
str2 = univ.town->spec_strs[label2];
if (label2>=univ.town->spec_strs.size())
showError("cStringRecorder(): bad label 2.");
else
str2 = univ.town->spec_strs[label2];
break;
case NOTE_OUT:
str1 = univ.scenario.outdoors[label1b][label2b]->spec_strs[label1];
str2 = univ.scenario.outdoors[label1b][label2b]->spec_strs[label2];
// memory problem, ie. called with label=65535(-1)
if (label2>=univ.scenario.outdoors[label1b][label2b]->spec_strs.size())
showError("cStringRecorder(): bad label 2.");
else
str2 = univ.scenario.outdoors[label1b][label2b]->spec_strs[label2];
break;
}
if(univ.party.record(type, str1, location))