Skip to content

Protocol: VariantValue: fix GetDictionaryEntry type check, fix GetStructFieldType out-of-bounds check. #417

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

Merged
tmds merged 1 commit into from
Mar 15, 2026
Merged

Protocol: VariantValue: fix GetDictionaryEntry type check, fix GetStructFieldType out-of-bounds check. #417

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
8 changes: 4 additions & 4 deletions src/Tmds.DBus.Protocol/VariantValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ public KeyValuePair<VariantValue, VariantValue> GetDictionaryEntry(int i)
}

var values = _o as KeyValuePair<VariantValue, VariantValue>[];
if (_o is null)
if (values is null)
{
ThrowCannotRetrieveAs(Type, VariantValueType.Dictionary);
}
Expand Down Expand Up @@ -1696,7 +1696,7 @@ public SignatureCheck(ReadOnlySpan<byte> signature)

private static long GetStructVariantMask(ReadOnlySpan<byte> signature)
{
signature = signature.Slice(1, signature.Length - 1);
signature = signature.Slice(1, signature.Length - 2);
int i = 0;
long mask = 0;
while (TryReadSingleCompleteType(ref signature, out ReadOnlySpan<byte> itemSignature))
Expand Down Expand Up @@ -1898,7 +1898,7 @@ public VariantValueType ValueType
internal VariantValueType GetStructFieldType(int index)
{
EnsureTypeIs(VariantValueType.Struct);
if (index < 0 || index > UnsafeCount)
if (index < 0 || index >= UnsafeCount)
{
throw new IndexOutOfRangeException();
}
Expand Down Expand Up @@ -2070,7 +2070,7 @@ string TypeString(VariantValueType type, byte nesting)
{
0 => $"[{type}{suffix}]",
1 => $"[{nameof(VariantValueType.Variant)}<{type}{suffix}>]",
_ => $"[{nameof(VariantValueType.Variant)}^{nesting}<{type}{suffix}]>"
_ => $"[{nameof(VariantValueType.Variant)}^{nesting}<{type}{suffix}>]"
};
}

Expand Down
Loading