epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

better array count parsing

Browse Source
This commit is contained in:
Matej Sekoranja
2012-10-12 12:31:18 +02:00
parent e264f5f51d
commit 1a69f38cd4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
testApp/remote/pvput.cpp
View File

@@ -443,14 +443,16 @@ size_t fromString(PVScalarArrayPtr const &pv, StringArray const & from, size_t f
if (fromStartIndex >= fromValueCount)
throw std::runtime_error("not enough values, stopped at field " + pv->getFieldName());
unsigned int count;
int result = sscanf(from[fromStartIndex].c_str(), "%u", &count);
if (result != 1)
throw runtime_error("failed to parse element count value (uint) of field " + pv->getFieldName() + " from string value '" + from[fromStartIndex] + "'");
size_t count;
istringstream iss(from[fromStartIndex]);
iss >> count;
// not fail and entire value is parsed (e.g. to detect 1.2 parsing to 1)
if (iss.fail() || !iss.eof())
throw runtime_error("failed to parse element count value (uint) of field '" + pv->getFieldName() + "' from string value '" + from[fromStartIndex] + "'");
fromStartIndex++;
processed++;
if (static_cast<size_t>(fromStartIndex+count) > fromValueCount)
if ((fromStartIndex+count) > fromValueCount)
{
throw runtime_error("not enough array values for field " + pv->getFieldName());
}