Merge pull request #1136 from andersjonsson/new-fix-for-reading-binary

ReadElementContentAs... would return 0 on the second call, even if th…

Author: andersjonsson

src/SoapCore.Tests/XDocumentXmlReaderTests.cs

@@ -28,15 +28,14 @@ public void TestReadBase64()
 			var xdoc = XDocument.Parse(xml);
 			var reader = new XDocumentXmlReader(xdoc);
 
-			reader.Read();
 			reader.Read();
 			reader.Read();
 
 			var buffer = new byte[1024];
 			var ms = new MemoryStream();
 			while (true)
 			{
-				var i = reader.ReadContentAsBase64(buffer, 0, 1024);
+				var i = reader.ReadElementContentAsBase64(buffer, 0, 1024);
 				ms.Write(buffer, 0, i);
 
 				if (i < buffer.Length)

src/SoapCore/SoapCore.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<Description>SOAP protocol middleware for ASP.NET Core</Description>
-		<Version>1.2.1.5</Version>
+		<Version>1.2.1.6</Version>
 		<Authors>Digital Design</Authors>
 		<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;netcoreapp3.1;</TargetFrameworks>
 		<PackageId>SoapCore</PackageId>

src/SoapCore/XDocumentXmlReader.cs

@@ -42,9 +42,12 @@ public override int ReadContentAsBase64(byte[] buffer, int index, int count)
 
 		public override int ReadElementContentAsBase64(byte[] buffer, int index, int count)
 		{
-			if (!Read() || (_reader.NodeType != XmlNodeType.Text && _reader.NodeType != XmlNodeType.Whitespace))
+			if (!_isReadingBinary)
 			{
-				return 0;
+				if (!Read() || (_reader.NodeType != XmlNodeType.Text && _reader.NodeType != XmlNodeType.Whitespace))
+				{
+					return 0;
+				}
 			}
 
 			return ReadContentAsBase64(buffer, index, count);
@@ -57,9 +60,12 @@ public override int ReadContentAsBinHex(byte[] buffer, int index, int count)
 
 		public override int ReadElementContentAsBinHex(byte[] buffer, int index, int count)
 		{
-			if (!Read() || (_reader.NodeType != XmlNodeType.Text && _reader.NodeType != XmlNodeType.Whitespace))
+			if (!_isReadingBinary)
 			{
-				return 0;
+				if (!Read() || (_reader.NodeType != XmlNodeType.Text && _reader.NodeType != XmlNodeType.Whitespace))
+				{
+					return 0;
+				}
 			}
 
 			return ReadContentAsBinHex(buffer, index, count);
@@ -69,7 +75,13 @@ public int ReadBinary(byte[] buffer, int index, int count, bool isBase64)
 		{
 			EnsureBinaryStream(isBase64);
 
-			return _binaryStream!.Read(buffer, index, count);
+			var result = _binaryStream!.Read(buffer, index, count);
+			if (_binaryStream.Position == _binaryStream.Length)
+			{
+				_isReadingBinary = false;
+			}
+
+			return result;
 		}
 
 		public override bool Read()