drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

Add some missing field checks to JSON reader

Browse Source
This commit is contained in:
Gary Talent 2017-09-08 18:06:27 -05:00
parent 3e90ec87b9
commit 11c7c49d7b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nostalgia/studio/lib/json_read.hpp
View File

@ -59,18 +59,26 @@ class JsonReader {
template<typename T> template<typename T>
ox::Error JsonReader::op(QString fieldName, T *dest) { ox::Error JsonReader::op(QString fieldName, T *dest) {
auto obj = m_src[fieldName].toObject(); if (m_src.contains(fieldName)) {
auto reader = JsonReader(obj); auto obj = m_src[fieldName].toObject();
return ioOp(&reader, dest); auto reader = JsonReader(obj);
return ioOp(&reader, dest);
} else {
return JSON_ERR_FIELD_MISSING;
}
}; };
template<typename T> template<typename T>
ox::Error JsonReader::op(QString fieldName, QVector<T> *dest) { ox::Error JsonReader::op(QString fieldName, QVector<T> *dest) {
ox::Error err = 0; ox::Error err = 0;
auto a = m_src[fieldName].toArray(); if (m_src.contains(fieldName)) {
dest->resize(a.size()); auto a = m_src[fieldName].toArray();
for (int i = 0; i < dest->size(); i++) { dest->resize(a.size());
err |= op(a[i], &(*dest)[i]); for (int i = 0; i < dest->size(); i++) {
err |= op(a[i], &(*dest)[i]);
}
} else {
err |= JSON_ERR_FIELD_MISSING;
} }
return err; return err;
}; };