LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

Introduced a primitive check in the TRIM.SP reading routine in order to prevent a segmentation fault

Browse Source
This commit is contained in:
Bastian M. Wojek
2010-08-14 14:22:57 +00:00
parent 91c66651aa
commit f4d219a367
2 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/external/TFitPofB-lib/classes/TFitPofBStartupHandler.cpp vendored
View File

@ -358,7 +358,7 @@ void TFitPofBStartupHandler::CheckLists()
} }
if(fDebug) { if(fDebug) {
cout << "Energies and Labels:"; cout << "Energies and Labels:" << endl;
for ( map<double, string>::const_iterator iter(fEnergies.begin()); iter != fEnergies.end(); ++iter ) for ( map<double, string>::const_iterator iter(fEnergies.begin()); iter != fEnergies.end(); ++iter )
cout << iter->first << " " << iter->second << endl; cout << iter->first << " " << iter->second << endl;
} }

19
src/external/TFitPofB-lib/classes/TTrimSPDataHandler.cpp vendored
View File

@ -67,6 +67,7 @@ TTrimSPData::TTrimSPData(const string &path, map<double, string> &energies) {
double zz(0.0), nzz(0.0); double zz(0.0), nzz(0.0);
vector<double> vzz, vnzz; vector<double> vzz, vnzz;
string word, energyStr; string word, energyStr;
bool goodFile(false);
for ( map<double, string>::const_iterator iter(energies.begin()); iter != energies.end(); ++iter ) { for ( map<double, string>::const_iterator iter(energies.begin()); iter != energies.end(); ++iter ) {
@ -78,10 +79,17 @@ TTrimSPData::TTrimSPData(const string &path, map<double, string> &energies) {
delete rgeFile; delete rgeFile;
rgeFile = 0; rgeFile = 0;
} else { } else {
fEnergy.push_back(iter->first);
while(*rgeFile >> word) while(*rgeFile >> word) {
if(word == "PARTICLES") break; if(word == "PARTICLES") {
goodFile = true;
break;
}
}
if (goodFile) {
fEnergy.push_back(iter->first);
while(!rgeFile->eof()) { while(!rgeFile->eof()) {
*rgeFile >> zz >> nzz; *rgeFile >> zz >> nzz;
@ -107,7 +115,12 @@ TTrimSPData::TTrimSPData(const string &path, map<double, string> &energies) {
vzz.clear(); vzz.clear();
vnzz.clear(); vnzz.clear();
goodFile = false;
} else {
cerr << "TTrimSPData::TTrimSPData: " << energyStr << " does not seem to be a valid unmodified TRIM.SP output file!" << endl;
continue;
}
} }
} }