Skip to content

avoid array allocation in qname parsing #2042

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

Open
SimonCropp wants to merge 4 commits into
base: main
Choose a base branch
from
Open

avoid array allocation in qname parsing #2042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dc6ae0
avoid array allocation in qname parsing
SimonCropp Mar 22, 2026
0329d66
.
SimonCropp Mar 29, 2026
cdf892c
Update CompatibilityRuleAttributesValidator.cs
SimonCropp Mar 29, 2026
2e19ffb
Update CompatibilityRuleAttributesValidator.cs
SimonCropp Mar 31, 2026
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
8 changes: 4 additions & 4 deletions src/DocumentFormat.OpenXml.Framework/MCContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ internal IEnumerable<XmlQualifiedName> ParseQNameList(string qnameList, OnInvali

foreach (var qname in qnames)
{
var items = qname.Split(':');
if (items.Length != 2)
var colonIndex = qname.IndexOf(":", StringComparison.Ordinal);
if (colonIndex <= 0 || colonIndex == qname.Length - 1 || qname.IndexOf(":", colonIndex + 1, StringComparison.Ordinal) >= 0)
{
if (onInvalidQName(qnameList))
{
Expand All @@ -151,7 +151,7 @@ internal IEnumerable<XmlQualifiedName> ParseQNameList(string qnameList, OnInvali
}
}

var ns = LookupNamespaceDelegate?.Invoke(items[0]);
var ns = LookupNamespaceDelegate?.Invoke(qname.Substring(0, colonIndex));
if (ns.IsNullOrEmpty())
{
if (onInvalidQName(qnameList))
Expand All @@ -164,7 +164,7 @@ internal IEnumerable<XmlQualifiedName> ParseQNameList(string qnameList, OnInvali
}
}

yield return new XmlQualifiedName(items[1], ns);
yield return new XmlQualifiedName(qname.Substring(colonIndex + 1), ns);
}
}

Expand Down
7 changes: 4 additions & 3 deletions ...ocumentFormat.OpenXml.Framework/Validation/Schema/CompatibilityRuleAttributesValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Collections.Generic;

namespace DocumentFormat.OpenXml.Validation.Schema
Expand Down Expand Up @@ -189,14 +190,14 @@ internal static void ValidateMcAttributes(ValidationContext validationContext)
}

// must be QName
var items = qname.Value.Split(':');
if (items.Length != 2)
var colonIndex = qname.Value.IndexOf(":", StringComparison.Ordinal);
if (colonIndex <= 0 || colonIndex == qname.Value.Length - 1 || qname.Value.IndexOf(":", colonIndex + 1, StringComparison.Ordinal) >= 0)
{
return qname;
}

// Prefix must be already defined.
var attributeNamesapce = element.LookupNamespace(items[0]);
var attributeNamesapce = element.LookupNamespace(qname.Value.Substring(0, colonIndex));
if (attributeNamesapce.IsNullOrEmpty())
{
return qname;
Expand Down