sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[CORRECTED] sv_utils - check and skip processing lines consisting only of 0xa (windows) ( fixes #3359 )

Browse source
This commit is contained in:
artemp 2016-03-15 13:03:48 +01:00
parent 96b96c745d
commit b2fda7e17f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/input/csv/csv_utils.cpp
View file

@ -128,11 +128,11 @@ std::tuple<char, bool, char, char> autodetect_csv_flavour(std::istream & stream,
{ {
if (size < file_length && ss.eof()) if (size < file_length && ss.eof())
{ {
// we can't be sure last line // we can't be sure that last line
// is not truncated so skip it // is not truncated so skip it
break; break;
} }
if (line.size() == 0) continue; // empty lines are not interesting if (line.size() == 0 || (line.size() == 1 && line[0] == char(0xa))) continue; // empty lines are not interesting
auto num_quotes = std::count(line.begin(), line.end(), quote); auto num_quotes = std::count(line.begin(), line.end(), quote);
if (num_quotes % 2 != 0) if (num_quotes % 2 != 0)
{ {