arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add early continuation for parsing a continued line

pull/418/head
Jeffrey Walton 2017-05-12 03:05:24 -04:00
parent ac6db2fa91
commit d3986223a6
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
datatest.cpp
View File

@ -686,8 +686,11 @@ bool GetField(std::istream &is, std::string &name, std::string &value)
while (continueLine && std::getline(is, line)) while (continueLine && std::getline(is, line))
{ {
// Leading, trailing and position. The leading iterator moves right, and trailing iterator // Early out for immediately continuing a line
// moves left. When finished, the sub-string in the middle is the value for the name. if (!line.empty() && line[0] == '\\') { continue; }
// Leading, trailing and temp position. The leading iterator moves right, and trailing
// iterator moves left.The sub-string in the middle is the value for the name.
std::string::size_type l, t, p; std::string::size_type l, t, p;
const std::string whitespace = " \r\n\t\v\f"; const std::string whitespace = " \r\n\t\v\f";
@ -698,7 +701,7 @@ bool GetField(std::istream &is, std::string &name, std::string &value)
continueLine = false; continueLine = false;
if (t != std::string::npos && line[t] == '\\') { if (t != std::string::npos && line[t] == '\\') {
continueLine = true; continueLine = true;
t = line.find_last_not_of(whitespace, t); t = line.find_last_not_of(whitespace, t-1);
} }
p = line.find('#', l); p = line.find('#', l);
@ -770,6 +773,9 @@ void TestDataFile(std::string filename, const NameValuePairs &overrideParameters
if (!GetField(file, name, value)) if (!GetField(file, name, value))
break; break;
// Can't assert value. Plaintext is sometimes empty.
// CRYPTOPP_ASSERT(!value.empty());
v[name] = value; v[name] = value;
if (name == "Test" && (s_thorough || v["SlowTest"] != "1")) if (name == "Test" && (s_thorough || v["SlowTest"] != "1"))