diff options
author | jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-20 14:38:21 +0000 |
---|---|---|
committer | jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-20 14:38:21 +0000 |
commit | 3fb752a921a56fb4ea3188fb12f02f6a5749480e (patch) | |
tree | cb7adb54a4e7ef4c1b9267a2856d642fa46a265c | |
parent | 3e20c50d509708bc0c0dedb02ec8dbfbfe1ac301 (diff) | |
download | ruby-3fb752a921a56fb4ea3188fb12f02f6a5749480e.tar.gz |
* lib/csv.rb: Fixed a broken regular expression that was causing
CSV to miss escaping some special meaning characters when used
in parsing.
Reported by David Unric
[ruby-core:54986] [Bug #8405]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/csv.rb | 3 | ||||
-rwxr-xr-x | test/csv/test_features.rb | 8 |
3 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Thu Mar 20 11:37:28 2014 James Edward Gray II <james@graysoftinc.com> + + * lib/csv.rb: Fixed a broken regular expression that was causing + CSV to miss escaping some special meaning characters when used + in parsing. + Reported by David Unric + [ruby-core:54986] [Bug #8405] + Thu Mar 20 16:53:07 2014 Koichi Sasada <ko1@atdot.net> * gc.c (objspace_malloc_increase): should not invoke diff --git a/lib/csv.rb b/lib/csv.rb index e5ecf5c9a8..2326792cd7 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -1507,8 +1507,7 @@ class CSV # if we can transcode the needed characters # @re_esc = "\\".encode(@encoding) rescue "" - @re_chars = /#{%"[-][\\.^$?*+{}()|# \r\n\t\f\v]".encode(@encoding)}/ - # @re_chars = /#{%"[-][\\.^$?*+{}()|# \r\n\t\f\v]".encode(@encoding, fallback: proc{""})}/ + @re_chars = /#{%"[-\\]\\[\\.^$?*+{}()|# \r\n\t\f\v]".encode(@encoding)}/ init_separators(options) init_parsers(options) diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb index a83fff84d8..ad7e44d854 100755 --- a/test/csv/test_features.rb +++ b/test/csv/test_features.rb @@ -74,6 +74,14 @@ class TestCSV::Features < TestCSV end end + def test_bug_8405 + TEST_CASES.each do |test_case| + assert_equal( test_case.last.map { |t| t.tr('"', "|") unless t.nil? }, + CSV.parse_line( test_case.first.tr('"', "|"), + quote_char: "|" ) ) + end + end + def test_csv_char_readers %w[col_sep row_sep quote_char].each do |reader| csv = CSV.new("abc,def", reader.to_sym => "|") |