merge revision(s) r45374: [Backport ruby#8405]

nagachika · nagachika · commit 75edd5f7a30c · 2014-05-15T15:28:16.000Z
* 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 ruby#8405] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+Fri May 16 00:27:02 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]
+
 Fri May 16 00:14:25 2014  Kohei Suzuki  <eagletmt@gmail.com>
 
 	* vm_method.c (rb_method_entry_get_without_cache): me->klass is 0
diff --git a/lib/csv.rb b/lib/csv.rb
@@ -1507,8 +1507,7 @@ def initialize(data, options = Hash.new)
     # 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
@@ -74,6 +74,14 @@ def test_quote_char
     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 => "|")
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-05-16"
-#define RUBY_PATCHLEVEL 101
+#define RUBY_PATCHLEVEL 102
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5

Original file line number	Diff line number	Diff line change
`@@ -1507,8 +1507,7 @@ def initialize(data, options = Hash.new)`
`1507`	`1507`	`# if we can transcode the needed characters`
`1508`	`1508`	`#`
`1509`	`1509`	`@re_esc = "\\".encode(@encoding) rescue ""`
`1510`		`- @re_chars = /#{%"[-][\\.^$?*+{}()\|# \r\n\t\f\v]".encode(@encoding)}/`
`1511`		`- # @re_chars = /#{%"[-][\\.^$?*+{}()\|# \r\n\t\f\v]".encode(@encoding, fallback: proc{""})}/`
	`1510`	`+ @re_chars = /#{%"[-\\]\\[\\.^$?*+{}()\|# \r\n\t\f\v]".encode(@encoding)}/`
`1512`	`1511`
`1513`	`1512`	`init_separators(options)`
`1514`	`1513`	`init_parsers(options)`