Fixed issue with multiple character delimiter not working when the fi…

…rst char of the delimiter precedes the actual delimiter. e.g. 1!#2!!#3
JoshClose · Apr 17, 2020 · 8751336 · 8751336
1 parent 30b1333
commit 8751336
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/CsvHelper/CsvParser.cs b/src/CsvHelper/CsvParser.cs
@@ -878,6 +878,8 @@ protected virtual bool ReadDelimiter()
 				return true;
 			}
 
+			var originalC = c;
+			var charsRead = 0;
 			for (var i = 1; i < context.ParserConfiguration.Delimiter.Length; i++)
 			{
 				if (fieldReader.IsBufferEmpty && !fieldReader.FillBuffer())
@@ -887,8 +889,12 @@ protected virtual bool ReadDelimiter()
 				}
 
 				c = fieldReader.GetChar();
+				charsRead++;
 				if (c != context.ParserConfiguration.Delimiter[i])
 				{
+					c = originalC;
+					fieldReader.SetBufferPosition(-charsRead);
+
 					return false;
 				}
 			}

diff --git a/tests/CsvHelper.Tests/Parsing/DelimiterTests.cs b/tests/CsvHelper.Tests/Parsing/DelimiterTests.cs
@@ -52,5 +52,22 @@ public void NullDelimiterTest()
 				Assert.AreEqual("3", line[2]);
 			}
 		}
+
+		[TestMethod]
+		public void FirstCharOfDelimiterNextToDelimiterTest()
+		{
+			var s = new StringBuilder();
+			s.AppendLine("1!#2!!#3");
+			using (var reader = new StringReader(s.ToString()))
+			using (var parser = new CsvParser(reader, CultureInfo.InvariantCulture))
+			{
+				parser.Configuration.Delimiter = "!#";
+				var row = parser.Read();
+
+				Assert.AreEqual("1", row[0]);
+				Assert.AreEqual("2!", row[1]);
+				Assert.AreEqual("3", row[2]);
+			}
+		}
 	}
 }