Skip to content

src: refactor EndsInANumber in node_url.cc and adds IsIPv4NumberValid #46227

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
nodejs-github-bot merged 14 commits into from
Jan 23, 2023
Merged

src: refactor EndsInANumber in node_url.cc and adds IsIPv4NumberValid #46227

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ff9c478
src: refactor EndsInANumber in node_url.cc and adds IsIPv4NumberValid
miguelteixeiraa Jan 16, 2023
f076935
src: fix node_url.cc code formatting
miguelteixeiraa Jan 16, 2023
b1f4c83
src: fix node_url.cc code formatting (back to what it was)
miguelteixeiraa Jan 16, 2023
95d3081
src: refactor EndsInANumber in node_url.cc to use string_view::rfind
miguelteixeiraa Jan 17, 2023
e9282ad
src: fix imports typo in node_url.cc
miguelteixeiraa Jan 17, 2023
a683d34
src: removes unnecessary if statement from EndsInANumber in node_url.cc
miguelteixeiraa Jan 17, 2023
d165e39
src: use string_view instead of string in EndsInANumber in node_url.cc
miguelteixeiraa Jan 17, 2023
573dd4a
src: fix string_view constructor call for IsIPv4NumberValid in node_u…
miguelteixeiraa Jan 17, 2023
b52bbd4
src: adds minor tweaks to EndsInANumber at node_url.cc
miguelteixeiraa Jan 18, 2023
3074383
src: adds comment to IsIPv4NumberValid conditions in node_url.cc
miguelteixeiraa Jan 18, 2023
de4f065
src: cast interators to size_t in IsIPv4NumberValid call in node_url.cc
miguelteixeiraa Jan 18, 2023
9058eb5
src: cast interator to const char* in IsIPv4NumberValid call in node_…
miguelteixeiraa Jan 18, 2023
b65769f
src: use &(*it) to make windows build pass + ::all_of instead of ::fi…
miguelteixeiraa Jan 19, 2023
9534455
src: refactor EndsInANumber to be more readable in node_url.cc
miguelteixeiraa Jan 20, 2023
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
Next Next commit
src: fix string_view constructor call for IsIPv4NumberValid in node_u… 
…rl.cc
  • Loading branch information
@miguelteixeiraa
miguelteixeiraa committed Jan 17, 2023
commit 573dd4af7dda4da573f6f165f5f5898852a46f1d
4 changes: 2 additions & 2 deletions src/node_url.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ bool EndsInANumber(const std::string_view input) {
return true;
}

return IsIPv4NumberValid(std::string_view(
pointer_start, std::distance(pointer_start, pointer_end)));
return IsIPv4NumberValid(
std::string_view(&*pointer_start, pointer_end - pointer_start));
Copy link
Copy Markdown
Member

@anonrig anonrig Jan 17, 2023

Choose a reason for hiding this comment

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

This is too hacky (even if it's guaranteed safe).

Copy link
Copy Markdown
Contributor Author

@miguelteixeiraa miguelteixeiraa Jan 18, 2023

Choose a reason for hiding this comment

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

removed!

Copy link
Copy Markdown
Contributor Author

@miguelteixeiraa miguelteixeiraa Jan 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I'll try a static_cast<const char*>

Copy link
Copy Markdown
Member

@anonrig anonrig Jan 18, 2023

Choose a reason for hiding this comment

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

@nodejs/cpp-reviewers any recommendations?

Copy link
Copy Markdown
Member

@addaleax addaleax Jan 18, 2023

Choose a reason for hiding this comment

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

Yeah: I would definitely recommeng to go back to the original "hacky" implementation. It works and looks correct, even if it is not visually pretty. (I'd also not call this pointer if it's an iterator.) const_cast<char*>(pointer_start) doesn't even really make sense since the string_view constructor takes a const char* argument.

Copy link
Copy Markdown
Contributor Author

@miguelteixeiraa miguelteixeiraa Jan 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, I think it only works on the other compilers because their implementations for the iterator are:
std::string_view::iterator' (aka 'const char *')
(I purposely caused an error to catch this 'aka' haha)

}

void URLHost::ParseIPv4Host(const char* input, size_t length) {
Expand Down