From cbd32e2565e303b9c64e4f183c57d3858f9f2f73 Mon Sep 17 00:00:00 2001 From: "S.Stronin" Date: Tue, 5 Mar 2024 18:41:55 +0300 Subject: [PATCH] Fixed: potential null reference in XmlTreeGen when DataSet not defined --- src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs b/src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs index 1e3c38ce0b532c..a5f00bb0993d21 100644 --- a/src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs +++ b/src/libraries/System.Data.Common/src/System/Data/xmlsaver.cs @@ -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; } @@ -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); }