Manually backporting dotnet#74599 to 7.0 for RC2.

StephenMolloy · Sep 9, 2022 · 291c470 · 291c470
1 parent 8bb1983
commit 291c470
Show file tree

Hide file tree

Showing 5 changed files with 394 additions and 103 deletions.
diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Xml/XmlBinaryReader.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Xml/XmlBinaryReader.cs
@@ -1350,14 +1350,14 @@ private unsafe int ReadArray(float[] array, int offset, int count)
 
  public override int ReadArray(string localName, string namespaceUri, float[] array, int offset, int count)
  {
- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement))
+ if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement) && BitConverter.IsLittleEndian)
  return ReadArray(array, offset, count);
  return base.ReadArray(localName, namespaceUri, array, offset, count);
  }
 
  public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, float[] array, int offset, int count)
  {
- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement))
+ if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.FloatTextWithEndElement) && BitConverter.IsLittleEndian)
  return ReadArray(array, offset, count);
  return base.ReadArray(localName, namespaceUri, array, offset, count);
  }
@@ -1373,14 +1373,14 @@ private unsafe int ReadArray(double[] array, int offset, int count)
 
  public override int ReadArray(string localName, string namespaceUri, double[] array, int offset, int count)
  {
- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement))
+ if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement) && BitConverter.IsLittleEndian)
  return ReadArray(array, offset, count);
  return base.ReadArray(localName, namespaceUri, array, offset, count);
  }
 
  public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, double[] array, int offset, int count)
  {
- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement))
+ if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DoubleTextWithEndElement) && BitConverter.IsLittleEndian)
  return ReadArray(array, offset, count);
  return base.ReadArray(localName, namespaceUri, array, offset, count);
  }
@@ -1396,14 +1396,14 @@ private unsafe int ReadArray(decimal[] array, int offset, int count)
 
  public override int ReadArray(string localName, string namespaceUri, decimal[] array, int offset, int count)
  {
- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement))
+ if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement) && BitConverter.IsLittleEndian)
  return ReadArray(array, offset, count);
  return base.ReadArray(localName, namespaceUri, array, offset, count);
  }
 
  public override int ReadArray(XmlDictionaryString localName, XmlDictionaryString namespaceUri, decimal[] array, int offset, int count)
  {
- if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement))
+ if (IsStartArray(localName, namespaceUri, XmlBinaryNodeType.DecimalTextWithEndElement) && BitConverter.IsLittleEndian)
  return ReadArray(array, offset, count);
  return base.ReadArray(localName, namespaceUri, array, offset, count);
  }