Skip to content

Fix UB in check_timeouts shift and CRC reflect #90

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
Pivok7 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix UB in check_timeouts shift and CRC reflect #90

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
7 changes: 4 additions & 3 deletions include/enet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,10 +1545,11 @@ extern "C" {
static enet_uint32 crcTable[256];

static enet_uint32 reflect_crc(int val, int bits) {
int result = 0, bit;
enet_uint32 result;
int bit;

for (bit = 0; bit < bits; bit++) {
if (val & 1) { result |= 1 << (bits - 1 - bit); }
if (val & 1) { result |= 1u << (bits - 1 - bit); }
val >>= 1;
}

Expand Down Expand Up @@ -2969,7 +2970,7 @@ extern "C" {

if (peer->earliestTimeout != 0 &&
(ENET_TIME_DIFFERENCE(host->serviceTime, peer->earliestTimeout) >= peer->timeoutMaximum ||
((1u << (outgoingCommand->sendAttempts - 1)) >= peer->timeoutLimit &&
(outgoingCommand->sendAttempts > 32 || (1u << (outgoingCommand->sendAttempts - 1)) >= peer->timeoutLimit &&
ENET_TIME_DIFFERENCE(host->serviceTime, peer->earliestTimeout) >= peer->timeoutMinimum))
) {
enet_protocol_notify_disconnect_timeout(host, peer, event);
Expand Down