1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

csv.rb: fix field_size_limit check

Browse Source 
* lib/csv.rb (CSV#shift): the last column is an Array in extended
  column since r55985.  [ruby-dev:49964] [Bug #13149]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-01-23 05:59:28 +00:00
parent 9600fb38a9
commit 5bb125c63e
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/csv.rb
View File

@ -1927,7 +1927,7 @@ class CSV
if @io.eof? if @io.eof?
raise MalformedCSVError, raise MalformedCSVError,
"Unclosed quoted field on line #{lineno + 1}." "Unclosed quoted field on line #{lineno + 1}."
elsif @field_size_limit and csv.last.size >= @field_size_limit elsif @field_size_limit and csv.last.sum(&:size) >= @field_size_limit
raise MalformedCSVError, "Field size exceeded on line #{lineno + 1}." raise MalformedCSVError, "Field size exceeded on line #{lineno + 1}."
end end
# otherwise, we need to loop and pull some more data to complete the row # otherwise, we need to loop and pull some more data to complete the row

22
test/csv/test_csv_parsing.rb
View File

@ -209,6 +209,28 @@ class TestCSV::Parsing < TestCSV
field_size_limit: 2048 ) field_size_limit: 2048 )
end end
def test_field_size_limit_in_extended_column_not_exceeding
data = <<~DATA
"a","b"
"
2
",""
DATA
assert_nothing_raised(CSV::MalformedCSVError) do
CSV.parse(data, field_size_limit: 4)
end
end
def test_field_size_limit_in_extended_column_exceeding
data = <<~DATA
"a","b"
"
2345
",""
DATA
assert_parse_errors_out(data, field_size_limit: 5)
end
private private
def assert_parse_errors_out(*args) def assert_parse_errors_out(*args)