Skip to content

Add check bytes for voice packet #4728

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
G-Moris wants to merge 2 commits into from
+3 −0
Closed

Add check bytes for voice packet #4728

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cb7350
Update
Feb 26, 2026
49c5a58
Merge branch 'master' into add-check1-voice
G-Moris Feb 26, 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
3 changes: 3 additions & 0 deletions Server/mods/deathmatch/logic/packets/CVoiceDataPacket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ bool CVoiceDataPacket::Read(NetBitStreamInterface& BitStream)

if (BitStream.Read(voiceBufferLength) && voiceBufferLength <= m_voiceBuffer.capacity())
{
if (!BitStream.CanReadNumberOfBytes(voiceBufferLength))
Copy link
Copy Markdown
Contributor

@DmitriyColeman DmitriyColeman Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check is actually unnecessary and essentially redundant. The logic drops invalid packets in
if (BitStream.Read(voiceBufferLength) && voiceBufferLength <= m_voiceBuffer.capacity())

Copy link
Copy Markdown
Author

@G-Moris G-Moris Feb 26, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will it handle a scheme like this?

Write(2048);
Write("", 0);

I doubt it.

Copy link
Copy Markdown
Contributor

@DmitriyColeman DmitriyColeman Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it does. If you attempt to read more from the BitStream than is available, it simply returns false.

Copy link
Copy Markdown
Author

@G-Moris G-Moris Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it does. If you attempt to read more from the BitStream than is available, it simply returns false.

Calling resize is more expensive than performing a single check.

Copy link
Copy Markdown
Contributor

@DmitriyColeman DmitriyColeman Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you call resize when the buffer is already that size, it doesn't consume significant CPU time, as no reallocations occur..

Copy link
Copy Markdown
Author

@G-Moris G-Moris Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you call resize when the buffer is already that size, it doesn't consume significant CPU time, as no reallocations occur..

If you're that confident about it - good.

return false;

m_voiceBuffer.resize(voiceBufferLength);
return BitStream.Read(reinterpret_cast<char*>(m_voiceBuffer.data()), m_voiceBuffer.size());
}
Expand Down
Loading