diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-15 15:28:16 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-15 15:28:16 +0000 |
commit | a9006d3af053afd1d93caa5dfb609a4f9b3c41d5 (patch) | |
tree | 8d7dac5bdb506bbb23f60c701bb071d12ceb9a44 /lib | |
parent | 67f5f1be206c7ecb19aeb4cb1167dcedfb3466bd (diff) |
merge revision(s) r45374: [Backport #8405]
* 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/branches/ruby_2_1@45956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/csv.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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) |