Updated T4 template for CsvParser.

JoshClose · Apr 17, 2020 · e72b6f2 · e72b6f2
1 parent 8751336
commit e72b6f2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/CsvHelper/CsvParser.cs b/src/CsvHelper/CsvParser.cs
@@ -919,6 +919,8 @@ protected virtual async Task<bool> ReadDelimiterAsync()
 				return true;
 			}
 
+			var originalC = c;
+			var charsRead = 0;
 			for (var i = 1; i < context.ParserConfiguration.Delimiter.Length; i++)
 			{
 				if (fieldReader.IsBufferEmpty && !await fieldReader.FillBufferAsync().ConfigureAwait(false))
@@ -928,8 +930,12 @@ protected virtual async Task<bool> ReadDelimiterAsync()
 				}
 
 				c = fieldReader.GetChar();
+				charsRead++;
 				if (c != context.ParserConfiguration.Delimiter[i])
 				{
+					c = originalC;
+					fieldReader.SetBufferPosition(-charsRead);
+
 					return false;
 				}
 			}

diff --git a/src/CsvHelper/CsvParser.tt b/src/CsvHelper/CsvParser.tt
@@ -538,6 +538,8 @@ namespace CsvHelper
 				return true;
 			}
 
+			var originalC = c;
+			var charsRead = 0;
 			for (var i = 1; i < context.ParserConfiguration.Delimiter.Length; i++)
 			{
 				if (fieldReader.IsBufferEmpty && !<#= Await(isAsync) #>fieldReader.FillBuffer<#= AsyncPostfix(isAsync) #>()<#= ConfigureAwait(isAsync) #>)
@@ -547,8 +549,12 @@ namespace CsvHelper
 				}
 
 				c = fieldReader.GetChar();
+				charsRead++;
 				if (c != context.ParserConfiguration.Delimiter[i])
 				{
+					c = originalC;
+					fieldReader.SetBufferPosition(-charsRead);
+
 					return false;
 				}
 			}