Skip to content

Check the length of an NDEF message before checking the end terminator #2288

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
Ellerbach merged 1 commit into from
Mar 25, 2024
Merged

Check the length of an NDEF message before checking the end terminator #2288

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
4 changes: 2 additions & 2 deletions src/devices/Card/Ndef/NdefMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public static (int Start, int Size) GetStartSizeNdef(Span<byte> toExtract)
public static byte[]? ExtractMessage(Span<byte> toExtract)
{
var (idx, size) = GetStartSizeNdef(toExtract);
// Finally check that the end terminator TLV is 0xFE
bool isRealEnd = toExtract[idx + size] == 0xFE;
// Finally check that the optional end terminator TLV is 0xFE
bool isRealEnd = (toExtract.Length == idx + size) || (toExtract[idx + size] == 0xFE);
if (!isRealEnd)
{
return new byte[0];
Expand Down