Skip to content

[Repo Assist] Set DtdProcessing.Parse explicitly as the default for XML parsing #1636

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
github-actions wants to merge 1 commit into from
Closed

[Repo Assist] Set DtdProcessing.Parse explicitly as the default for XML parsing #1636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions src/FSharp.Data.Xml.Core/XmlRuntime.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace FSharp.Data.Runtime.BaseTypes

open System.ComponentModel
open System.IO
open System.Xml
open System.Xml.Linq

#nowarn "10001"
Expand Down Expand Up @@ -56,7 +57,12 @@ type XmlElement =
IsError = false)>]
static member Create(reader: TextReader) =
use reader = reader
let element = XDocument.Load(reader, LoadOptions.PreserveWhitespace).Root

let settings =
XmlReaderSettings(DtdProcessing = DtdProcessing.Parse)

use xmlReader = XmlReader.Create(reader, settings)
let element = XDocument.Load(xmlReader, LoadOptions.PreserveWhitespace).Root
{ XElement = element }

/// <exclude />
Expand All @@ -69,12 +75,21 @@ type XmlElement =
use reader = reader
let text = reader.ReadToEnd()

let settings =
XmlReaderSettings(DtdProcessing = DtdProcessing.Parse)

try
XDocument.Parse(text, LoadOptions.PreserveWhitespace).Root.Elements()
use stringReader = new StringReader(text)
use xmlReader = XmlReader.Create(stringReader, settings)

XDocument.Load(xmlReader, LoadOptions.PreserveWhitespace).Root.Elements()
|> Seq.map (fun value -> { XElement = value })
|> Seq.toArray
with _ when text.TrimStart().StartsWith "<" ->
XDocument.Parse("<root>" + text + "</root>", LoadOptions.PreserveWhitespace).Root.Elements()
use stringReader = new StringReader("<root>" + text + "</root>")
use xmlReader = XmlReader.Create(stringReader, settings)

XDocument.Load(xmlReader, LoadOptions.PreserveWhitespace).Root.Elements()
|> Seq.map (fun value -> { XElement = value })
|> Seq.toArray

Expand Down