Skip to content

fix: ctype UB, WebSocket over-read, stoi crash, signed shift UB, proto pollution #65763

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
VirajMishra1 wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −5
Open

fix: ctype UB, WebSocket over-read, stoi crash, signed shift UB, proto pollution #65763

Show file tree
Hide file tree
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
13 changes: 9 additions & 4 deletions src/inspector_io.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
#include "v8-inspector.h"
#include "zlib.h"

#include <deque>
#include <charconv>
#include <cstring>
#include <deque>
#include <vector>

namespace node {
Expand Down Expand Up @@ -378,12 +379,16 @@ void InspectorIoDelegate::MessageReceived(int session_id,
if (target_session_id_str) {
bool is_number = std::all_of(target_session_id_str->begin(),
target_session_id_str->end(),
::isdigit);
[](unsigned char c) { return ::isdigit(c); });
if (is_number) {
int target_session_id = std::stoi(*target_session_id_str);
int target_session_id = 0;
const auto& s = *target_session_id_str;
auto [ptr, ec] =
std::from_chars(s.data(), s.data() + s.size(), target_session_id);
if (ec != std::errc{}) return;
worker = TargetManager::WorkerForSession(target_session_id);
if (worker) {
merged_session_id += target_session_id << 16;
merged_session_id += static_cast<unsigned int>(target_session_id) << 16;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/inspector_socket.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ static ws_decode_result decode_frame_hybi17(const std::vector<char>& buffer,
}
size_t payload_length = static_cast<size_t>(payload_length64);

if (buffer.size() - kMaskingKeyWidthInBytes < payload_length)
if (static_cast<size_t>(buffer.end() - it) <
kMaskingKeyWidthInBytes + payload_length)
return FRAME_INCOMPLETE;

std::vector<char>::const_iterator masking_key = it;
Expand Down