diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2004-12-26 19:26:30 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2004-12-26 19:26:30 +0300 |
| commit | ea5f087e847bf843a5b0420dc8e068f07707e84c (patch) | |
| tree | 3ed429c513f0b56a4c5199baa2c5efffc414b6cb /mcs/class/System.XML/Mono.Xml.Schema | |
| parent | 09b5317ffd7e190e3d80c9df0b5f3642a7f2c8cd (diff) | |
2004-12-26 Atsushi Enomoto <atsushi@ximian.com>
* XmlSchema.cs : XmlResolver.ResolveUri() may return null.
* XmlParserContext.cs : all the string properties must not be set as
null. Thanks to Joshua.
* XmlTextReader.cs,
DTDObjectModel.cs,
DTDReader.cs : XmlResolver.ResolveUri() may return null.
* XsdValidatingReader.cs : XmlResolver.ResolveUri() may return null.
* XslFunction.cs,
Compiler.cs : XmlResolver.ResolveUri() may return null.
svn path=/trunk/mcs/; revision=38084
Diffstat (limited to 'mcs/class/System.XML/Mono.Xml.Schema')
| -rw-r--r-- | mcs/class/System.XML/Mono.Xml.Schema/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog index c265b8f4e82..368b6b64d56 100644 --- a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog @@ -1,3 +1,7 @@ +2004-12-22 Atsushi Enomoto <atsushi@ximian.com> + + * XsdValidatingReader.cs : XmlResolver.ResolveUri() may return null. + 2004-12-16 Atsushi Enomoto <atsushi@ximian.com> * XsdValidatingReader.cs : added ActualSchemaType to context type. diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs index 4c5a4c66732..51cbbcb98c0 100644 --- a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs +++ b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs @@ -215,6 +215,7 @@ namespace Mono.Xml.Schema // It is used only for independent XmlReader use, not for XmlValidatingReader. #if NET_2_0 + [Obsolete] public override object ReadTypedValue () #else public object ReadTypedValue () @@ -1507,9 +1508,10 @@ namespace Mono.Xml.Schema private XmlSchema ReadExternalSchema (string uri) { Uri absUri = resolver.ResolveUri ((BaseURI != "" ? new Uri (BaseURI) : null), uri); + string absUriString = absUri != null ? absUri.ToString () : String.Empty; XmlTextReader xtr = null; try { - xtr = new XmlTextReader (absUri.ToString (), + xtr = new XmlTextReader (absUriString, (Stream) resolver.GetEntity ( absUri, null, typeof (Stream)), NameTable); |