Skip to content

WCCP: Fix offset calculation when parsing incoming packets #2484

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
squidadm wants to merge 2 commits into
base: v7
Choose a base branch
from
+3 −2
Open

WCCP: Fix offset calculation when parsing incoming packets #2484

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
45cbee0
WCCP: Fix offset calculation when parsing incoming packets (#2480)
askolesnik Aug 24, 2026
8219e41
Merge branch 'v7' into v7-backport-pr2480
yadij Sep 6, 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
1 change: 1 addition & 0 deletions CONTRIBUTORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Thank you!
Andrew Novikov <as.asaw@gmail.com>
Andrew Tridgell
Andrey <rybakovandrey85@gmail.com>
Andrey Kolesnik <akolesnik@astralinux.ru>
Andrey Shorin <tolsty@tushino.com>
Ankor <ankor2023@gmail.com>
Anonymous <bigparrot@pirateperfection.com>
Expand Down
4 changes: 2 additions & 2 deletions src/wccp2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,9 +1142,9 @@ static size_t
CheckFieldDataLength(const FieldHeader *header, const size_t dataLength, const void *areaStart, const size_t areaSize, const char *error)
{
assert(header);
const auto dataStart = reinterpret_cast<const char*>(header) + sizeof(header);
const auto dataStart = reinterpret_cast<const char*>(header) + sizeof(*header);
CheckSectionLength(dataStart, dataLength, areaStart, areaSize, error);
return sizeof(header) + dataLength; // no overflow after CheckSectionLength()
return sizeof(*header) + dataLength; // no overflow after CheckSectionLength()
}

/// Positions the given field at a given start within a given packet area.
Expand Down
Loading