Skip to content

Revert "Try fix for consumeHexNumber to improve hex parsing" #1937

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
uNetworkingAB merged 1 commit into from
Aug 15, 2026
+14 −16
Merged

Revert "Try fix for consumeHexNumber to improve hex parsing" #1937

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
30 changes: 14 additions & 16 deletions src/ChunkedEncoding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,26 @@ namespace uWS {
inline void consumeHexNumber(std::string_view &data, uint64_t &state) {
/* Consume everything higher than 32 */
while (data.length() && data.data()[0] > 32) {

unsigned char digit = (unsigned char)data.data()[0];
unsigned int number;

if (digit >= '0' && digit <= '9') {
number = (unsigned int) (digit - '0');
} else if (digit >= 'a' && digit <= 'f') {
number = (unsigned int) (digit - 'a') + 10;
} else if (digit >= 'A' && digit <= 'F') {
number = (unsigned int) (digit - 'A') + 10;
} else {
/* Not a hex digit: chunk-size token ends here (chunk-ext follows) */
break;
if (digit >= 'a') {
digit = (unsigned char) (digit - ('a' - ':'));
} else if (digit >= 'A') {
digit = (unsigned char) (digit - ('A' - ':'));
}

if (chunkSize(state) & STATE_SIZE_OVERFLOW) {

unsigned int number = ((unsigned int) digit - (unsigned int) '0');

if (number > 16 || (chunkSize(state) & STATE_SIZE_OVERFLOW)) {
state = STATE_IS_ERROR;
return;
}

uint64_t bits = STATE_IS_CHUNKED;

// extract state bits
uint64_t bits = /*state &*/ STATE_IS_CHUNKED;

state = (state & STATE_SIZE_MASK) * 16ull + number;

state |= bits;
data.remove_prefix(1);
}
Expand Down
Loading