chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some crashes that result from an invalid PR properties file.

Browse Source
This commit is contained in:
sawinglogz 2021-05-23 15:02:01 -04:00
parent f1e31282bb
commit 793a621b4d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -386,11 +386,11 @@ bool PRS1ModelInfo::IsTested(const QHash<QString,QString> & props) const
bool PRS1ModelInfo::IsBrick(const QString & model) const bool PRS1ModelInfo::IsBrick(const QString & model) const
{ {
bool is_brick; bool is_brick = false;
if (m_modelNames.contains(model)) { if (m_modelNames.contains(model)) {
is_brick = m_bricks.contains(model); is_brick = m_bricks.contains(model);
} else { } else if (model.length() > 0) {
// If we haven't seen it before, assume any 2xx is a brick. // If we haven't seen it before, assume any 2xx is a brick.
is_brick = (model.at(0) == QChar('2')); is_brick = (model.at(0) == QChar('2'));
} }
@ -737,11 +737,16 @@ bool PRS1Loader::PeekProperties(const QString & filename, QHash<QString,QString>
src = new RawDataFile(f); src = new RawDataFile(f);
} }
QTextStream in(src); {
QTextStream in(src); // Scope this here so that it's torn down before we delete src below.
do { do {
QString line = in.readLine(); QString line = in.readLine();
QStringList pair = line.split("="); QStringList pair = line.split("=");
if (pair.size() != 2) {
qWarning() << src->name() << "malformed line:" << line;
break;
}
if (s_longFieldNames.contains(pair[0])) { if (s_longFieldNames.contains(pair[0])) {
pair[0] = s_longFieldNames[pair[0]]; pair[0] = s_longFieldNames[pair[0]];
@ -756,8 +761,11 @@ bool PRS1Loader::PeekProperties(const QString & filename, QHash<QString,QString>
props[pair[0]] = pair[1]; props[pair[0]] = pair[1];
} while (!in.atEnd()); } while (!in.atEnd());
}
delete src; delete src;
return true;
return props.size() > 0;
} }
bool PRS1Loader::PeekProperties(MachineInfo & info, const QString & filename, Machine * mach) bool PRS1Loader::PeekProperties(MachineInfo & info, const QString & filename, Machine * mach)