[ruby/csv] Do not loop forever when skip_lines regexp matches zero length with anchors (ruby#110)

crazymykl · nobu · commit d57bc03ba986 · 2020-07-20T02:32:49.000+09:00
* Do not loop forever when skip_lines regexp matches zero length with anchors * Remove needless white spaces * Add missing eos check in skip_needless_lines * Simplify test ruby/csv@3b15d4a3e8
diff --git a/lib/csv/parser.rb b/lib/csv/parser.rb
@@ -769,7 +769,7 @@ def build_scanner
     def skip_needless_lines
       return unless @skip_lines
 
-      while true
+      until @scanner.eos?
         @scanner.keep_start
         line = @scanner.scan_all(@not_line_end) || "".encode(@encoding)
         line << @row_separator if parse_row_end
diff --git a/test/csv/parse/test_skip_lines.rb b/test/csv/parse/test_skip_lines.rb
@@ -102,4 +102,11 @@ def test_multibyte_data
                              :skip_lines => /\A#/))
     end
   end
+
+  def test_empty_line_and_liberal_parsing
+    assert_equal([["a", "b"]],
+                 CSV.parse("a,b\n",
+                           :liberal_parsing => true,
+                           :skip_lines => /^$/))
+  end
 end
