Skip to content

Fix string compare deltas #220

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
marchc1 merged 2 commits into from
Oct 20, 2026
+16 −1
Merged

Fix string compare deltas #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c62c9ad
Fix string delta compare reading past 32 bits
ZehMatt Oct 20, 2026
1f8ddd2
Assert ReadUBitLong reads between 1 and 32 bits
ZehMatt Oct 20, 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
2 changes: 2 additions & 0 deletions Source.Common/Bitbuffers/bf_read.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@ public uint ReadUBitVar() {
public uint ReadUBitLong(uint bits) => ReadUBitLong((int)bits); // macro

public uint ReadUBitLong(int bits) {
Assert(bits > 0 && bits <= 32);

if (BitsLeft < bits) {
curBit = dataBits;
TriggerOverflow();
Expand Down
15 changes: 14 additions & 1 deletion Source.Engine/DtEncode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,19 @@ public static void VectorXY_SkipProp(SendProp prop, bf_read p) {
}
#endregion
#region SendPropType.String
static bool AreBitsDifferent(bf_read buf1, bf_read buf2, int bits) {
int dwords = bits >> 5;
bool diff = false;
for (int i = 0; i < dwords; i++)
diff |= buf1.ReadUBitLong(32) != buf2.ReadUBitLong(32);

int remainingBits = bits - (dwords << 5);
if (remainingBits > 0)
diff |= buf1.ReadUBitLong(remainingBits) != buf2.ReadUBitLong(remainingBits);

return diff;
}

public static int String_CompareDeltas(SendProp prop, bf_read p1, bf_read p2) {
int len1 = (int)p1.ReadUBitLong(Constants.DT_MAX_STRING_BITS);
int len2 = (int)p2.ReadUBitLong(Constants.DT_MAX_STRING_BITS);
Expand All @@ -452,7 +465,7 @@ public static int String_CompareDeltas(SendProp prop, bf_read p1, bf_read p2) {
if (len1 == 0)
return 0;

return p1.CompareBits(p2, len1 * 8) ? 1 : 0;
return AreBitsDifferent(p1, p2, len1 * 8) ? 1 : 0;
}
else {
p1.SeekRelative(len1 * 8);
Expand Down
Loading