Skip to content

Fixed: potential null reference in XmlTreeGen when DataSet not defined #99306

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

Closed
wants to merge 2 commits into from
Closed

Fixed: potential null reference in XmlTreeGen when DataSet not defined #99306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbd32e2
Fixed: potential null reference in XmlTreeGen when DataSet not defined
Mar 5, 2024
a01838d
Merge branch 'main' into main-svsdev-xmlsaver-null-ds-av
sstronin Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@ private string FindTargetNamespace(DataTable table)
}
}
}
else
else if(_ds != null)
{ // if it does not have any parent table , then it should inherit NS from DataSet
tgNamespace = _ds!.Namespace;
}
Expand Down Expand Up @@ -1507,7 +1507,7 @@ internal XmlElement HandleColumn(DataColumn col, XmlDocument dc, XmlElement sche
schNode.AppendChild(root);
root = _dc.CreateElement(Keywords.XSD_PREFIX, refString, Keywords.XSDNS);
root.SetAttribute(Keywords.REF, _prefixes[col.Namespace] + ":" + col.EncodedColumnName);
if (col.Table.Namespace != _ds!.Namespace)
if (col.Table.Namespace != _ds?.Namespace)
{
_ = GetSchema(col.Table.Namespace);
}
Expand Down