Skip to content

src: some refactoring of node_url.cc #17470

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
addaleax wants to merge 4 commits into from
Closed

src: some refactoring of node_url.cc #17470

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e86f577
src: minor cleanups to node_url.cc
addaleax Dec 5, 2017
c28a3a4
src: move url internals into anonymous namespace
addaleax Dec 5, 2017
363ad6a
src: make url host a proper C++ class
addaleax Dec 5, 2017
c8bef2d
src: use correct OOB check for IPv6 parsing
addaleax Dec 5, 2017
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
Prev Previous commit
src: use correct OOB check for IPv6 parsing 
`last_piece` pointed to the end of the 8×16 bit array,
so `piece_pointer == last_piece` already means that the pointer
is not writable any longer.

Previously, this still worked most of the time but could
result in an out-of-bounds-write.

Also, rename `last_piece` to `buffer_end` to avoid this pitfall.
  • Loading branch information
@addaleax
addaleax committed Dec 5, 2017
commit c8bef2df4ba5a10e4ee7659352a9b50e72d1773a
10 changes: 5 additions & 5 deletions src/node_url.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ void URLHost::ParseIPv6Host(const char* input, size_t length) {
for (unsigned n = 0; n < 8; n++)
value_.ipv6[n] = 0;
uint16_t* piece_pointer = &value_.ipv6[0];
uint16_t* last_piece = piece_pointer + 8;
uint16_t* const buffer_end = piece_pointer + 8;
uint16_t* compress_pointer = nullptr;
const char* pointer = input;
const char* end = pointer + length;
Expand All @@ -665,7 +665,7 @@ void URLHost::ParseIPv6Host(const char* input, size_t length) {
compress_pointer = piece_pointer;
}
while (ch != kEOL) {
if (piece_pointer > last_piece)
if (piece_pointer >= buffer_end)
Copy link
Copy Markdown
Member

@TimothyGu TimothyGu Dec 5, 2017

Choose a reason for hiding this comment

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

Wow, nice catch!

Copy link
Copy Markdown
Member Author

@addaleax addaleax Dec 5, 2017

Choose a reason for hiding this comment

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

@TimothyGu well, it was breaking CI for me, soooo... ;)

Wouldn't have seen it without the tests breaking.

return;
if (ch == ':') {
if (compress_pointer != nullptr)
Expand All @@ -690,7 +690,7 @@ void URLHost::ParseIPv6Host(const char* input, size_t length) {
return;
pointer -= len;
ch = pointer < end ? pointer[0] : kEOL;
if (piece_pointer > last_piece - 2)
if (piece_pointer > buffer_end - 2)
return;
numbers_seen = 0;
while (ch != kEOL) {
Expand Down Expand Up @@ -744,7 +744,7 @@ void URLHost::ParseIPv6Host(const char* input, size_t length) {

if (compress_pointer != nullptr) {
swaps = piece_pointer - compress_pointer;
piece_pointer = last_piece - 1;
piece_pointer = buffer_end - 1;
while (piece_pointer != &value_.ipv6[0] && swaps > 0) {
uint16_t temp = *piece_pointer;
uint16_t* swap_piece = compress_pointer + swaps - 1;
Expand All @@ -754,7 +754,7 @@ void URLHost::ParseIPv6Host(const char* input, size_t length) {
swaps--;
}
} else if (compress_pointer == nullptr &&
piece_pointer != last_piece) {
piece_pointer != buffer_end) {
return;
}
type_ = HostType::H_IPV6;
Expand Down