Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SDL | Changing ReadXml to a more secure overload. #2147

Merged
merged 2 commits into from
Sep 14, 2023
Merged

SDL | Changing ReadXml to a more secure overload. #2147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a13265
SDL | Changing ReadXml to a more secure overload.
JRahnama Sep 5, 2023
a5e5b49
adjust xmlreader with using statement.
JRahnama Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbMetaDataFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Xml;

namespace Microsoft.Data.ProviderBase
{
Expand Down Expand Up @@ -499,9 +500,14 @@ private void LoadDataSetFromXml(Stream XmlStream)
{
_metaDataCollectionsDataSet = new DataSet
{
Locale = System.Globalization.CultureInfo.InvariantCulture
Locale = CultureInfo.InvariantCulture
};
XmlReaderSettings settings = new()
{
XmlResolver = null
};
_metaDataCollectionsDataSet.ReadXml(XmlStream);
using XmlReader reader = XmlReader.Create(XmlStream, settings);
_metaDataCollectionsDataSet.ReadXml(reader);
}

protected virtual DataTable PrepareCollection(string collectionName, string[] restrictions, DbConnection connection)
Expand Down