Skip to content
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

src: avoid OOB read in URL parser #33640

Closed
wants to merge 2 commits into from
Closed

src: avoid OOB read in URL parser #33640

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
8f0dd0f
src: avoid OOB read in URL parser
addaleax May 29, 2020
ffc213e
fixup! src: avoid OOB read in URL parser
addaleax May 29, 2020
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
6 changes: 3 additions & 3 deletions src/node_url.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,7 @@ void URL::Parse(const char* input,
state = kSpecialRelativeOrAuthority;
} else if (special) {
state = kSpecialAuthoritySlashes;
} else if (p[1] == '/') {
} else if (p + 1 < end && p[1] == '/') {
state = kPathOrAuthority;
p++;
} else {
Expand Down Expand Up @@ -1548,7 +1548,7 @@ void URL::Parse(const char* input,
}
break;
case kSpecialRelativeOrAuthority:
if (ch == '/' && p[1] == '/') {
if (ch == '/' && p + 1 < end && p[1] == '/') {
state = kSpecialAuthorityIgnoreSlashes;
p++;
} else {
Expand Down Expand Up @@ -1696,7 +1696,7 @@ void URL::Parse(const char* input,
break;
case kSpecialAuthoritySlashes:
state = kSpecialAuthorityIgnoreSlashes;
if (ch == '/' && p[1] == '/') {
if (ch == '/' && p + 1 < end && p[1] == '/') {
p++;
} else {
continue;
Expand Down
20 changes: 20 additions & 0 deletions test/cctest/test_url.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,26 @@ TEST_F(URLTest, Base3) {
EXPECT_EQ(simple.path(), "/baz");
}

TEST_F(URLTest, TruncatedAfterProtocol) {
char input[2] = { 'q', ':' };
URL simple(input, sizeof(input));

EXPECT_FALSE(simple.flags() & URL_FLAGS_FAILED);
EXPECT_EQ(simple.protocol(), "q:");
EXPECT_EQ(simple.host(), "");
EXPECT_EQ(simple.path(), "/");
}

TEST_F(URLTest, TruncatedAfterProtocol2) {
char input[6] = { 'h', 't', 't', 'p', ':', '/' };
URL simple(input, sizeof(input));

EXPECT_TRUE(simple.flags() & URL_FLAGS_FAILED);
EXPECT_EQ(simple.protocol(), "http:");
EXPECT_EQ(simple.host(), "");
EXPECT_EQ(simple.path(), "");
}

TEST_F(URLTest, ToFilePath) {
#define T(url, path) EXPECT_EQ(path, URL(url).ToFilePath())
T("http://example.org/foo/bar", "");
Expand Down