diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-12-03 19:18:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-03 19:18:51 -0500 |
| commit | 9f76369150e5e290c5ab58843713c5afe8b57283 (patch) | |
| tree | 95231785e83ad3d981ffa78e8cf190686d6d4e4a /MediaBrowser.MediaEncoding | |
| parent | c14dc5686d8d9227ec327a9b15cc9905ab16e3b4 (diff) | |
| parent | 7ed6c67db0f28c5776d972668a438369c3b96aef (diff) | |
Merge pull request #2327 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs index 9804bc1db6..de055146a8 100644 --- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs +++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs @@ -211,13 +211,18 @@ namespace MediaBrowser.MediaEncoding.Probing reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { if (reader.NodeType == XmlNodeType.Element) { switch (reader.Name) { case "dict": + if (reader.IsEmptyElement) + { + reader.Read(); + continue; + } using (var subtree = reader.ReadSubtree()) { ReadFromDictNode(subtree, info); @@ -253,7 +258,7 @@ namespace MediaBrowser.MediaEncoding.Probing reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { if (reader.NodeType == XmlNodeType.Element) { @@ -279,9 +284,14 @@ namespace MediaBrowser.MediaEncoding.Probing } break; case "array": - if (!string.IsNullOrWhiteSpace(currentKey)) + if (reader.IsEmptyElement) { - using (var subtree = reader.ReadSubtree()) + reader.Read(); + continue; + } + using (var subtree = reader.ReadSubtree()) + { + if (!string.IsNullOrWhiteSpace(currentKey)) { pairs.AddRange(ReadValueArray(subtree)); } @@ -308,13 +318,19 @@ namespace MediaBrowser.MediaEncoding.Probing reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { if (reader.NodeType == XmlNodeType.Element) { switch (reader.Name) { case "dict": + + if (reader.IsEmptyElement) + { + reader.Read(); + continue; + } using (var subtree = reader.ReadSubtree()) { var dict = GetNameValuePair(subtree); @@ -397,7 +413,7 @@ namespace MediaBrowser.MediaEncoding.Probing reader.Read(); // Loop through each element - while (!reader.EOF) + while (!reader.EOF && reader.ReadState == ReadState.Interactive) { if (reader.NodeType == XmlNodeType.Element) { |