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

fixed bounds check for time types

Browse Source
This commit is contained in:
john30
2014-12-31 09:59:54 +01:00
parent b717a0561b
commit 699ee88b5b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+7 -2
View File
@@ -487,7 +487,7 @@ result_t StringDataField::readSymbols(SymbolString& input,
{ {
size_t start = 0, count = m_length; size_t start = 0, count = m_length;
int incr = 1; int incr = 1;
unsigned char ch, last = 0; unsigned char ch, last = 0, hour = 0;
if (baseOffset + m_length > input.size()) { if (baseOffset + m_length > input.size()) {
return RESULT_ERR_INVALID_POS; return RESULT_ERR_INVALID_POS;
@@ -552,7 +552,12 @@ result_t StringDataField::readSymbols(SymbolString& input,
else else
ch = (ch % 6) * 10; // minutes ch = (ch % 6) * 10; // minutes
} }
if ((i == 0 && ch > 24) || (i > 0 && (ch > 59 || (last == 24 && ch > 0) ))) if (i == 0) {
if (ch > 24)
return RESULT_ERR_OUT_OF_RANGE; // invalid hour
hour = ch;
}
else if (ch > 59 || (hour == 24 && ch > 0))
return RESULT_ERR_OUT_OF_RANGE; // invalid time return RESULT_ERR_OUT_OF_RANGE; // invalid time
if (i > 0) if (i > 0)
output << ":"; output << ":";