nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix getName() and getField() with ignored count

Browse Source
This commit is contained in:
John
2022-01-29 12:43:34 +01:00
parent 7128a380f3
commit 03ea563afe
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+4 -7
View File
@@ -971,7 +971,7 @@ size_t DataFieldSet::getCount(PartType partType, const char* fieldName) const {
}
string DataFieldSet::getName(ssize_t fieldIndex) const {
if (fieldIndex < (ssize_t)m_ignoredCount) {
if (fieldIndex < 0) {
return m_name;
}
if ((size_t)fieldIndex + m_ignoredCount >= m_fields.size()) {
@@ -987,7 +987,7 @@ string DataFieldSet::getName(ssize_t fieldIndex) const {
continue;
}
remain--;
if (remain == 0) {
if (remain <= 0) {
return field->getName(-1);
}
}
@@ -998,10 +998,7 @@ string DataFieldSet::getName(ssize_t fieldIndex) const {
}
const SingleDataField* DataFieldSet::getField(ssize_t fieldIndex) const {
if (fieldIndex < (ssize_t)m_ignoredCount) {
return nullptr;
}
if ((size_t)fieldIndex + m_ignoredCount >= m_fields.size()) {
if (fieldIndex < 0 || (size_t)fieldIndex + m_ignoredCount >= m_fields.size()) {
return nullptr;
}
if (m_ignoredCount == 0) {
@@ -1013,7 +1010,7 @@ const SingleDataField* DataFieldSet::getField(ssize_t fieldIndex) const {
continue;
}
remain--;
if (remain == 0) {
if (remain <= 0) {
return field;
}
}